Temp fix for PLFM-1835. Do not merge back into develop branch.
Merge pull request #377 from xschildw/release-1.23

Temp fix for PLFM-1835. Do not merge back into develop branch.
fix
Merge pull request #381 from john-hill/PLFM-1840

fix
Merge pull request #380 from john-hill/PLFM-1840

fix
Merge pull request #378 from bkng/develop

PLFM-1648: Code review changes
allow files in studies
Merge pull request #382 from john-hill/PLFM-1841

allow files in studies
Merge branch 'release-1.23' into develop
Merge pull request #383 from john-hill/develop

Develop
Temp ignore int test until sec back up
Merge pull request #384 from xschildw/release-1.23

Temp ignore int test until sec back up
3 more tests to ignore
And let one
Merge pull request #385 from xschildw/release-1.23

3 more tests to ignore
Remove unused method
Merge pull request #386 from eric-wu/develop

Remove unused method
Merge branch 'release-1.23' into develop
Remove @Ignore from 1.23 merge