Fixes bug in db-bootstrap where importing Singletons sometimes results in a duplicate.
Merge branch 'release/2.3' into release/2.4
Merge branch 'release/2.4'