Add modules to support current projects
Merge branch 'f-newmodules' into dev
Merge branch 'dev'