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