Merge pull request #11768 from tundebabzy/issue-11749

add missing field and value parameters