Fixed commit SYNC-327