ds-234: some more changes
complete feature : merging ft-ds-234 into develop