Fix issue on stratis, when spawing for first time
Merge branch 'Development_main' into extDB_beta
Merge remote-tracking branch 'upstream/extDB_beta' into extDB_beta