Merge "Moved addAutopromoteOnceGroups() call to a deferred update"