settings: Squashed commit of CMHW features