Merge branch 'release/1.34'

# Conflicts:
#	docker/build_image.py