Merge branch 'new/bug_4218' into kcmaster