BACKLOG-3649: Convert into OSGI bundle