rebase from yves in reservation_activity