Support NUCCORE-922 for bytecode enhancement contract change