Imported v1.3.4 bug fixes