import bugfixes
Merge branch 'tcuje' into dev