Merge branch 'nd/remove-opt-boolean'