Merge branch 'master' into ksII-rm-dev