1.0-beta.32.1 (dkh.799):
- Issue #281: backport Issue #226 fix