Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
! Fixed template instantiation for shared files in Makefile
Merge branch 'hotfix/makefile' into develop