Merge "Take new backported test cases into account"