Issue #2720869 by jibran: Remove the use of deprecated CssSelector and use CssSelectorConverter instead