periodic update of ft branch : merging develop into ft-ds-234
complete feature : merging ft-ds-234 into develop