- merged OsServiceOptions with Joegen changes