Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster