Merge branch 'topic/sync.1_22_3'