Osgi fixed 2489 maintenance

Backport for #2489