Bring back sync
queue with deprecation (until: 3.5.0).
#16132
Merged
sync
queue with deprecation (until: 3.5.0).
#16132