Game wall fixes

- ASDK-2459
- ASDK-2461