Merge branch 'release/1.6.4'
Merge branch 'release/1.6.5'
Revert "Fix bug regarding database query bindings using values containing commas"

This reverts commit aadaf8c49322365cba5c99498df0987f64ca2090.
Merge branch 'master' into develop
Fix bug regarding database query bindings using values containing commas