Merge "Fix codegen not accepting relative paths"