Merge pull request #1181 from Sage-Bionetworks/release-36

PLFM-2666
Merge branch 'release-37' into develop