merge 3.2.0.b18 jrcportal release into 3.2.0-jrcportal