Merge "Fix odm privapp permissions" into main