merging missed code from 4.2.0 to 4.3.0