3.2.0 jrcportal

Trying to merge jrcportal-master into branch for release