Merge pull request #969 from john-hill/PLFM-2482

changed
Ignored test
Merge pull request #971 from xschildw/release-26

Ignored test
Another ignore
Merge pull request #972 from xschildw/release-26

Another ignore
Undo test ignores
Merge pull request #973 from xschildw/release-26

Undo test ignores
Merge branch 'release-26' into develop