Updated the semantics of --output-dir option per PM-693