fixes #902
fixes #904 #903
v 3.3.4
fixes #929
Version 3.3.4 merge hotfixes