Merge branch 'pm-assorted'