Merge proposals

hardtoneselector has no merge proposals.