Fix code formatting issues

11 jobs for fix-400-template-hierarchy in 7 minutes and 43 seconds (queued for 3 seconds)
latest