Merge remote-tracking branch 'kc/master' into merged_5549