merge bcse's 14dc329 - Refine some string id.