prototype
modify query
modify query
fri
fri2
pre-test
added test
Merge pull request #1314 from john-hill/SWC-1686

Swc 1686