Merge "Cat rescue." into oc-mr1-dev