completing changes for 234
complete feature : merging ft-ds-234 into develop