oo-cpr: important - Pull request from 0c414cb63fcd4caccf0ac30c6f574afb5a484c64