Merging changes from dev branch for 2.4.3.0 release