Merge pull request #22262 from Anurag810/shift_management

refactor: shift management