Break it clang tidy#973

johnmcfarlane wants to merge 2 commits intomainjohnmcfarlane/cnl:mainfrom

break-it_clang-tidyjohnmcfarlane/cnl:break-it_clang-tidyCopy head branch name to clipboard