Merge branch 'new/bug_5277' into kcmaster