minor pet changes
Merge remote-tracking branch 'origin/QA-branch' into pet-QA