Merge branch 'JAL-986_idwidthprefs' into develop