Merge pull request #381 from rattoma/4.3

GSA fixes for rmse analysis (cherry picked)