r8834: changes for clsql 2