UNDO: Merge "unrecognized long opt" fix from 6.4.2