Merge remote-tracking branch 'origin/master' into revive_old_kf_codes_3