Updated language feature as required in #16786