AS7-6639 Add synchronization to workaround ISPN-2866