16.8.3

Note

This pull-request is copied from #1647, because CIs are not compatible for pull-requests from external forks now.
For convenience, @HansRobo created this pull-request, but original author is @AnzhiZhang

Description

See #1646

Abstract

This PR fixes #1646

Background

Details

References

Destructive Changes

Known Limitations

Related Issues

#1646