am 43b80810: Merge "Factor out option variables from int to bool types"

* commit '43b80810284bd0eb43a4488044f902c910c9f3b2':
  Factor out option variables from int to bool types