Merge branch 'HPCC-9791-improvement' of github.com:AttilaVamos/HPCC-Platform into HPCC-9791-improvement

Conflicts:
	dali/ft/daftformat.cpp

Signed-off-by: Attila.Vamos <attila.vamos@gmail.com>