- Last selective merge from Heaven7 efforts. Nothing works in here at
  the moment. Requires inheritance cleanup.