Support NUCCORE-922 bytecode enhancement changes