SRAMP-29 StoredQuery support
Merge pull request #494 from brmeyer/SRAMP-29

SRAMP-29 StoredQuery support