Selectively merged changes from version 1.4.6