Merge 3.2.0 jrcportal multithreading 836 into jrc master