(cherry picked from commit 5537800) (cherry picked from commit 5614874)
For better compatibility if we add experimental stuff in 1.0.X compilers