- potential fix?
- finally (?) really solved the modal reset problems
Merge branch 'feature/MOBBL-1057' into develop