fixed SS-347 and made some other changes in bin.xml