merge update from ...MoKee:kk_mkt