Merge remote branch 'kc/new/bug2567' into kcmaster