adding updates related to 2.3.2