oo-cpr: dobbymoodge-important2-dev1 - Pull request from dobbymoodge-important2-dev1