Merge "Split shortcuts instruction update" into main