chore(common/models): Merge branch 'change/common/models/template-modularization' into change/common/models/lm-worker-modularization
