Merging changes from dev branch for 2.4.2.0 release