Merge branch 'ds-ftune' into hft-dev

Conflicts:
	BigFullChain.h