Merge "Fix raw references to Promise"