Merge branch 'origin/dev'

Version 1.9.4.3