Diff cw-1.0.16-r3 with a cw-1.0.16-r5

Thank you!