Merge "Remove hack code for without cross user permission" into main