Merge `master` into `dev-0.2.8`