GATEWAY-3247: subtask GATEWAY-3280 updates. Code complete.