Description of the Problem
Merged collided changes from commits 42b27e9ff522ce2ceb07be52556c772343bca7e4 and a8bd9132b5d360ab86c429a7c200ba3025a84654

seem to have caused an issue in unit test VersionSelection.test.tsx

How reproducible:

always

Steps to Reproduce:

1. Merge recent changes of upstream/master
2. Run yarn test VersionSelection.test.tsx

Actual results:

Test fails 

Expected results:

Test should not fail