Merge pull request #3762 from xhaggi/confluence-pvr