Merge "Support KM_LONG_REP"