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