Merge "work with empty reclass"