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