merging back osgi updates