Fix int/enum conversion bug: re esupport (TXX-867549)