Merge branch 'JAL-986_idwidthprefs' into JAL-976_jabaws2supp