Merge "Add OsCompat"