Feature/5517 split sync post