t745 fixed the cprs note issues noted on this ticket
Merge branch 't735' into ooo_pilot