Merge pull request #7105 from remitamine/pbs