Merge "Fix None value for new reclass"