CF-5802 Fixed conditional parameters sumbmission