Merge "Fix applyAdjustmentsFromAssistants"