Issue 5867 osgi updates

Fixes issues #5867 #5043 #6121 #5848 #4637