Merge "Include mockito extended explicitly" into main