Issue #20865: Fixed issue with duplicate none values