BZ986000 - Unable to use some options for int sub-fields in Guvnor
(cherry picked from commit ff7331383300f63249c013b87bd6c94fa8043df1)