Which problem is this PR solving? Closes # Short description of the changes How to verify that this has the expected result