Merge "Allow project-pattern to be overridable"