Merge `development` into `h2-10`

Just keeping it up-to-date.