Merge chanegs from version 4.3.4
Merge changes from 4.3.4 release