Merge branch `agnostic` into master