Merge branch 'JAL-1319_jronn_npe' into Release_2_8_Branch