Unit passed.
Merge branch 'develop' into PLFM-2920b
Ignore 2 tests to get build going
Merge pull request #1657 from xschildw/PLFM-2920b

Plfm 2920b