Merge "Finish removing "inline" URI scheme"