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