- More selective merging of changes from Heaven7 efforts. This could go
  on a while...