HHH-7914 - Improve new stored procedure call support