Removing handling of optional parameters when passing null as parameter [ci skip]