Merge "Add missing JUnit @Rule-s." into main