not using spl on modelRow as files are camelcase
Merge branch 'dev' into base-build