Update to v2397

Changelog v2397:
- Issues 1-5 has been solves