Merge 2.10.x to master (plus a test)

Review by @phaller