Discard support for bellow 7.0