To support latest compiler 3.21.107-g4bd09eb