fix buildSession call for database handler
Merge branch '4.2'