Merge branch 'feature/cancellable-reservations' into develop
Merge branch 'develop' into feature/maven-to-gradle