Changes made for  	EB-7895, EB-7893 and EB-7587