Merge "Add OsCompat" into sc-dev