Merge "Support for custom add custom labels from reclass"