Merge "Fix the crash on the UnrestrictedDataAccess"