TW-33790 Reduced number of requests for parameters
(cherry picked from commit 2a7364a)