See #5535