merge dev_5_0 -D org -I include -E exclude: PR 915 (Fix for single channel  meas_mode 13 data.)
merge dev_5_0 -D org -I include -E exclude: PR 916 (Testing copy of PR-911)