Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-22 98c51b309741620d7a9d6bf6260327a6041b8f12

1
2
3
4
5
6
<?xml version="1.0" encoding="UTF-8"?> 
<project version="4"> 
  <component name="CompilerConfiguration"> 
    <bytecodeTargetLevel target="1.8" /> 
  </component> 
</project>