See PLFM-2241
Merge pull request #747 from john-hill/develop

See PLFM-2241