reinstated version from release 73 so as to use SQL queries
Merging postreleasefix/78 to release/78

* postreleasefix/78:
  reinstated version from release 73 so as to use SQL queries