Merge "maintenance: Consistently use hasOption() for boolean options"