Fixes #3092. Thanks for the report!
Will be merged to the release branch as soon as tests have cycled successfully.