Backport !81 to v1.1

See !81 (merged)