As result of #8777 (closed)
This will automatically solve:
And many other problems without issue number.