instead of trying to quote functions, add fromRaw() instead
Merge branch 'issue24v2' into develop-2