Merged into common template tag; tests and docs.