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

wxr

2022-01-23 e6156ab41aea16796798eb32fd7ce664345a8220

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>