Backport latest cukes from 1.12-stable branch

Fixes #734, fixes #733