Pre- V[23].34 changes