0.0.9 stuff

Change-Id: Id5554c2179afcd494055dda1d309d89b11367126