Back-port to v2 branch

Something isn't working

This issue or pull request already exists

New feature or request

Extra attention is needed

This doesn't seem right

Further information is requested

Related to automated test cases

This will not be worked on

work in progress

No labels found. Sorry about that.