Merge booking develop in main develop

This is not a good idea if we want to use it for 1% too.