Merge "Update compos permissions"