Ovmsupport

Pulling back up against master so we can keep following it a bit...