bug fix on database operator extraction
Merge branch 'dev' into base-build