Trivial
Merge branch 'master' into 144-model-trigger-json-extensions
Minor style fixes