Merge branch 'ma/parse-maybe-bool'