Merge branch 'ocelot-vcap-fixes'