Merge branch `adaptor` into `master`.