Fix small typo
Merge branch 'dev' into dev-MK
small changes