Merge branch 'dev'
Version 2.6.5
Merge branch 'dev'
Version 2.6.6
Merge branch 'master' into dev