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.
Merge pull request #380 from john-hill/PLFM-1840

fix
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