SRAMP-29 StoredQuery support