Merge branch 'master' into dev
bugfix and error suppression
Merge branch 'dev'