Pull code from 3.6.0 to 3.6.1 - #355

Pull code from 3.6.0 to 3.6.1#355

vishwab1 wants to merge 11 commits into

release-3.6.1PSMRI/Common-API:release-3.6.1from

release-3.6.1-updatePSMRI/Common-API:release-3.6.1-updateCopy head branch name to clipboard