Merge jt

Jan Trávníčekrequested to merge
merge-jt into master

Extern template class + code reorganization to speedup compilation

Merge request reports