Merge "Don't believe the PV decoder's lies..." into ics-mr1