Merge branch 'new/bug_5307' into kcmaster