Merge branch 'new/bug_5690' into kcmaster