Merge "Fix parsing equivalence for new permission and flag"