Merge update from ..Mokee:kk_mkt