merge Amisha changes