updates from 1.34.161.1