Merge "Propagate config_at_end flag to reparent parent" into main