Merge branch 'dev' into 'main'
Database persistent data fix
See merge request aswi/aswi-2022/aswi2022bug-thugs!39
Merge branch 'dev' into 'main'
Database persistent data fix
See merge request aswi/aswi-2022/aswi2022bug-thugs!39