GATEWAY-3390 subtask GATEWAY-3423: fix for formatting issues.