Merge branch 'ma/remove-config-maybe-bool'