Merge pull request #2834 from Fice/fix_pvr_lock