3915 Add adjuncts support to the build (fix auto-mismerge)