Merge branch 'dev'
Merge branch 'dev' (v6.7)
add compatibity for TMP (Tab Mix Plus)
Merge branch 'master' into dev