Merge "Cherry-pick changes to select module accurately" into tm-dev