Nicolas and Christopher, thanks for the reviews!

I will merge the bugfix branch and close this ticket.