Merge "Revert "Fix None value for new reclass""