small fix
Merge branch 'master' into dev
#1300 tmp
#1300
#1217
#1217