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