PFC-2374 #comment SYNC-154