Cherrypicked 583699e19c and created branch v1.8031-dev