Merge branch ucsim-034-pre3 to main trunk; new version 0.4