Copy changes from 5.34