Merge "Use doReturn instead of when().thenReturn" into main