Merge "Fix parsing error for RestResourceSource"