Change default hashIdentifierFlag to FALSE
Merge branch 'singledb'
Merge branch 'singledb'
Merge with Markus's latest changes