Merge "Add new capability name." into tm-mainline-prod