Merge "[pm] restrict max number of components at parsing" into tm-dev