Integrate redpen enhancements (For MEAS-697)