Merge changes from plm master.