Merge branch 'develop' into feature/db_toString_support