Merge branch 'feature/optional_no_value_comparison_dialog' into develop