Merge branch '896-variant-type-docs' into 'master'