Merge some changes from ps into psMulti