Rev to 0.9.0 - patches related to internal testing / future wsapi support