loading common helper on loader rather than end of bootstrap
Merge branch 'dev' into base-build