[transport] Merge master into transport

Conflicts:
	python/sumk_dft.py