Note if we want to back-port to 3.2, the 2nd commit will need modifying to avoid updates to the Booking admin page, which does not exist in 3.2
Note if we want to back-port to 3.2, the 2nd commit will need modifying to avoid updates to the Booking admin page, which does not exist in 3.2