Merge branch 'atomic_move_restore_owner_group' into work