Merge changes, add side-by-side docs on extensions