Fix due latest PSM merge
Merge pull request #1709 from jalf/develop

Fix due latest PSM merge