LPS-47279 Moved to osgi core