Merge branch 'JAL-986_idwidthprefs' into Release_2_7_Branch