Merge "fix VDU parsing during granting"