Issue #145: merge 3.3.x