Merge branch 'bug_723_infobarext_pvr'