Merge branch 'tk/p4-with-explicity-sync'