Merge branch 'bug/JAL-1610refAnnotationsInViews' into Release_2_8_2_Branch