+ [OE-4026] restore findBookingSite method (which appears to have been lost in various merges)
Merge branch 'release/1.6' into develop