resolves #807 on release-v3.4