Merge branch 'pm-avs'