Fixes and improvements for release 3.4.140124