Merge pull request #19418 from eileenmcnaughton/template
authorSeamus Lee <seamuslee001@gmail.com>
Tue, 19 Jan 2021 10:06:48 +0000 (21:06 +1100)
committerGitHub <noreply@github.com>
Tue, 19 Jan 2021 10:06:48 +0000 (21:06 +1100)
[REF] Move related code to be together


Trivial merge