NXP-10414: more work in progress on new synchronizer refactoring