Bugifx / T4
Merge branch 'bugfixes'