Merge "Replace false for null in sourceFile() call"