Merge branch 'WJC' into temp-wxr

wxr

2021-05-23 4d14154c36ac5692aadc036eed97fb9f1c410e2a

 HDL_ON/UI/UI0-Stan/Controls/CompoundControls/NormalSelectControl.cs

old mode 100755
new mode 100644