GATEWAY-3371 subtask GATEWAY-3385: PD Sync and unit tests.