Port CM performance settings
squashed commit of cherry picks from cm