Merge "Add idmap completely parsed assertion"