Issue #7103 (mikma)