Gateway 3371 

Subtask GATEWAY-3385, Pd (sync and deferred).