[BUGFIX] for major bug in 1.1.12
Merge branch 'development'
Merge branch 'master' into development