You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/04/17 18:35:21 UTC

[isis-site] branch asf-site updated: updates website

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/isis-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new c8ce90c  updates website
c8ce90c is described below

commit c8ce90cd4f1a6f82280aa535ed516e52b1dea67c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Apr 17 19:32:12 2021 +0100

    updates website
---
 content/404.html                                   |    2 +-
 content/comguide/2.0.0-M5/about.html               |    2 +-
 content/comguide/2.0.0-M5/algolia-search.html      |    2 +-
 .../2.0.0-M5/antora-publish-procedure.html         |    2 +-
 content/comguide/2.0.0-M5/applying-patches.html    |    2 +-
 content/comguide/2.0.0-M5/cutting-a-release.html   |    2 +-
 content/comguide/2.0.0-M5/key-generation.html      |    2 +-
 .../comguide/2.0.0-M5/merging-a-pull-request.html  |    2 +-
 content/comguide/2.0.0-M5/pmc-notes.html           |    2 +-
 content/comguide/2.0.0-M5/policies.html            |    2 +-
 content/comguide/2.0.0-M5/policies/git-policy.html |    2 +-
 .../2.0.0-M5/policies/versioning-policy.html       |    2 +-
 .../comguide/2.0.0-M5/post-release-successful.html |    2 +-
 .../2.0.0-M5/post-release-unsuccessful.html        |    2 +-
 .../comguide/2.0.0-M5/release-process-prereqs.html |    2 +-
 .../comguide/2.0.0-M5/updating-the-website.html    |    2 +-
 content/comguide/2.0.0-M5/verifying-releases.html  |    2 +-
 content/conguide/2.0.0-M5/about.html               |    2 +-
 content/conguide/2.0.0-M5/agilej/about.html        |    2 +-
 .../conguide/2.0.0-M5/building-apache-isis.html    |    2 +-
 content/conguide/2.0.0-M5/contributing.html        |    2 +-
 ...ag-0a5124db4e5a007b09600f789391b49921470e5b.png |  Bin 8589 -> 8245 bytes
 ...ag-6583b9501f99503130bf355e5911a608e0345f19.svg | 1354 +++++++++--
 ...ag-754aa464614732e6d3716ee22fa558d5867965d3.svg |   18 +-
 content/conguide/2.0.0-M5/documentation/about.html |    2 +-
 .../2.0.0-M5/documentation/asciidoc-syntax.html    |    2 +-
 .../documentation/building-docs-and-website.html   |    2 +-
 .../conguide/2.0.0-M5/documentation/tooling.html   |    2 +-
 content/conguide/2.0.0-M5/eclipse/about.html       |    2 +-
 content/conguide/2.0.0-M5/git/about.html           |    2 +-
 content/conguide/2.0.0-M5/intellij/about.html      |    2 +-
 ...ag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg |    8 +-
 ...ag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg |   32 +-
 ...ag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg |   20 +-
 ...ag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg |   12 +-
 ...ag-14772700eda20fa11b253c46866367e33f4a263b.svg |   24 +-
 ...ag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg |    8 +-
 ...ag-412761b61755a662695ad967fe8bff44034633b1.svg |   48 +-
 ...ag-415bb880da3d6291f07b2309b72c30d23e203862.svg |   28 +-
 ...ag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg |   16 +-
 ...ag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg |   20 +-
 ...ag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg |   12 +-
 ...ag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg |   18 +-
 ...ag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg |    8 +-
 ...ag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg |   32 +-
 ...ag-8414526961173c7544fb1cd428be58cb7d649d23.svg |    8 +-
 ...ag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg |   24 +-
 ...ag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg |   28 +-
 ...ag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg |    8 +-
 ...ag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg |    8 +-
 ...ag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg |   12 +-
 ...ag-9a41e0a9cd62ff42635c6def5baef38282722299.svg |   28 +-
 ...ag-a02d72d118f555411ac927d71e37d031eee3f467.svg |   72 +-
 ...ag-a1eef212f9499278372b4df33828b0639e41657b.svg |    8 +-
 ...ag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg |   12 +-
 ...ag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg |   12 +-
 ...ag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg |   32 +-
 ...ag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg |    8 +-
 ...ag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg |    8 +-
 ...ag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg |   12 +-
 ...ag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg |   16 +-
 ...ag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg |   20 +-
 ...ag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg |   60 +-
 ...ag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg |   28 +-
 ...ag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg |   96 +-
 ...ag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg |    8 +-
 ...ag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg |   36 +-
 ...ag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg |   12 +-
 ...ag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg |    8 +-
 ...ag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg |   34 +-
 content/core/2.0.0-M5/_overview/about.html         |  235 +-
 content/core/2.0.0-M5/about.html                   |    2 +-
 content/core/2.0.0-M5/archdesign/about.html        |    2 +-
 content/core/2.0.0-M5/codegen-bytebuddy/about.html |    2 +-
 content/core/2.0.0-M5/commons/about.html           |    2 +-
 .../commons/concurrent-task-list-UNUSED.html       |    2 +-
 content/core/2.0.0-M5/interaction/about.html       |    2 +-
 .../core/2.0.0-M5/internaltestsupport/about.html   |    2 +-
 ...ag-7970de82f6aafe36a3bb869359f7e05e01e6a375.svg |   66 +-
 content/core/2.0.0-M5/metamodel/about.html         |    2 +-
 content/core/2.0.0-M5/metamodel/class-diagram.html |    2 +-
 content/core/2.0.0-M5/regressiontests/about.html   |    2 +-
 content/core/2.0.0-M5/runtime/about.html           |    2 +-
 content/core/2.0.0-M5/runtimeservices/about.html   |    2 +-
 content/core/2.0.0-M5/transaction/about.html       |    2 +-
 content/core/2.0.0-M5/webapp/about.html            |    2 +-
 content/core/2.0.0-M5/webapp/webmodules.html       |    2 +-
 content/docs/2.0.0-M5/about.html                   |    2 +-
 content/docs/2.0.0-M5/archive/1-x.html             |    2 +-
 content/docs/2.0.0-M5/demo/about.html              |    2 +-
 content/docs/2.0.0-M5/downloads/how-to.html        |    2 +-
 .../going-deeper/articles-and-presentations.html   |    2 +-
 content/docs/2.0.0-M5/going-deeper/books.html      |    2 +-
 content/docs/2.0.0-M5/landing-page/components.html |    2 +-
 content/docs/2.0.0-M5/landing-page/guides.html     |    2 +-
 content/docs/2.0.0-M5/landing-page/internal.html   |    2 +-
 content/docs/2.0.0-M5/landing-page/libraries.html  |    2 +-
 content/docs/2.0.0-M5/landing-page/releases.html   |    2 +-
 content/docs/2.0.0-M5/mavendeps/about.html         |    2 +-
 content/docs/2.0.0-M5/more-thanks/more-thanks.html |    2 +-
 content/docs/2.0.0-M5/parent-pom/about.html        |    2 +-
 content/docs/2.0.0-M5/resources/about.html         |    2 +-
 content/docs/2.0.0-M5/resources/cheatsheet.html    |    2 +-
 content/docs/2.0.0-M5/resources/icons.html         |    2 +-
 ...ag-5936d1561be55d4f98b2c97cf62e09251ce1dabf.svg |   18 +-
 ...ag-8ab7baff76ffc186da54f47082e4791d011a387e.svg |   18 +-
 content/docs/2.0.0-M5/starters/about.html          |    2 +-
 .../2.0.0-M5/starters/helloworld-script-jdo.html   |    2 +-
 .../2.0.0-M5/starters/helloworld-script-jpa.html   |    2 +-
 content/docs/2.0.0-M5/starters/helloworld.html     |    2 +-
 .../2.0.0-M5/starters/simpleapp-script-jdo.html    |    2 +-
 .../2.0.0-M5/starters/simpleapp-script-jpa.html    |    2 +-
 content/docs/2.0.0-M5/starters/simpleapp.html      |    2 +-
 content/docs/2.0.0-M5/support/about.html           |    2 +-
 content/docs/2.0.0-M5/support/mailing-list.html    |    2 +-
 content/docs/2.0.0-M5/support/slack-channel.html   |    2 +-
 .../what-is-apache-isis/common-use-cases.html      |    2 +-
 .../what-is-apache-isis/isis-in-pictures.html      |    2 +-
 .../what-is-apache-isis/screencasts-older.html     |    2 +-
 .../2.0.0-M5/what-is-apache-isis/screencasts.html  |    2 +-
 .../what-is-apache-isis/screencasts/playlists.html |    2 +-
 content/extensions/2.0.0-M5/about.html             |   21 +-
 content/incubator/2.0.0-M5/about.html              |    2 +-
 .../2.0.0-M5/kroviz/DevelopmentGuide.html          |    2 +-
 content/incubator/2.0.0-M5/kroviz/UsersGuide.html  |    2 +-
 ...ag-21002c3b24ff3586c7f6c1c97b8a50e9527e7d0c.svg |   56 +-
 ...ag-328cea0587916b9d66e4f95fc3432200f8204eff.svg |   66 +-
 ...ag-56e486c665357e8d145d01577626bc6931b28aec.svg |    4 +-
 ...ag-73fd787032f3e51ea8488f6ac0c31604b524e04b.svg |   36 +-
 ...ag-c35f3de4f309ea9d094fc134d2c5eb95e4443958.svg |   66 +-
 ...ag-e9e9c75cab2e20cf819e422eeb7ba10104e25602.svg |  120 +-
 ...ag-ff22daefe9416de25bf9c48b18681d35d0854a6a.svg |    4 +-
 content/incubator/2.0.0-M5/kroviz/about.html       |    2 +-
 content/incubator/2.0.0-M5/kroviz/credits.html     |    2 +-
 .../incubator/2.0.0-M5/kroviz/regression-test.html |    2 +-
 content/incubator/2.0.0-M5/vaadin/about.html       |    2 +-
 content/legacy/2.0.0-M5/about.html                 |    2 +-
 content/legacy/2.0.0-M5/applib/about.html          |    2 +-
 content/legacy/2.0.0-M5/commons/about.html         |    2 +-
 content/legacy/2.0.0-M5/metamodel/about.html       |    2 +-
 content/legacy/2.0.0-M5/restclient/about.html      |    2 +-
 content/legacy/2.0.0-M5/runtime/about.html         |    2 +-
 content/legacy/2.0.0-M5/servletapi/about.html      |    2 +-
 content/mappings/2.0.0-M5/about.html               |    2 +-
 content/mappings/2.0.0-M5/jaxrsclient/about.html   |   15 +-
 content/mappings/2.0.0-M5/minio/about.html         |    2 +-
 .../mappings/2.0.0-M5/outbox-publisher/about.html  |    2 +-
 content/mappings/2.0.0-M5/restclient/about.html    |   18 +-
 content/mappings/2.0.0-M5/slack/about.html         |    2 +-
 content/pjdo/2.0.0-M5/about.html                   |    2 +-
 .../disabling-persistence-by-reachability.html     |    2 +-
 content/pjdo/2.0.0-M5/db-schemas.html              |    2 +-
 content/pjdo/2.0.0-M5/dependency-injection.html    |    2 +-
 content/pjdo/2.0.0-M5/enhancer.html                |    2 +-
 content/pjdo/2.0.0-M5/hints-and-tips.html          |    2 +-
 .../hints-and-tips/diagnosing-n-plus-1.html        |    2 +-
 content/pjdo/2.0.0-M5/hints-and-tips/java8.html    |    2 +-
 .../hints-and-tips/jdoql-and-timestamps.html       |    2 +-
 .../hints-and-tips/overriding-jdo-annotations.html |    2 +-
 .../subtype-entity-not-fully-populated.html        |    2 +-
 .../typesafe-queries-and-fetchgroups.html          |    2 +-
 content/pjdo/2.0.0-M5/mapping-guide.html           |    2 +-
 .../mandatory-properties-in-subtypes.html          |    2 +-
 .../2.0.0-M5/mapping-guide/mapping-to-a-view.html  |    2 +-
 .../one-to-m-bidirectional-relationships.html      |    2 +-
 content/pjdo/2.0.0-M5/setup-and-configuration.html |    2 +-
 content/pjpa/2.0.0-M5/about.html                   |    2 +-
 content/pjpa/2.0.0-M5/db-schemas.html              |    2 +-
 content/pjpa/2.0.0-M5/dependency-injection.html    |    2 +-
 content/pjpa/2.0.0-M5/domain-services.html         |    2 +-
 content/pjpa/2.0.0-M5/mapping-guide.html           |    2 +-
 content/pjpa/2.0.0-M5/setup-and-configuration.html |    2 +-
 content/pjpa/2.0.0-M5/weaving.html                 |    2 +-
 content/refguide/2.0.0-M5/about.html               |    2 +-
 content/refguide/2.0.0-M5/applib-ant/Column.html   |    2 +-
 content/refguide/2.0.0-M5/applib-ant/Digits.html   |    2 +-
 .../2.0.0-M5/applib-ant/Discriminator.html         |    2 +-
 .../2.0.0-M5/applib-ant/NotPersistent.html         |    2 +-
 content/refguide/2.0.0-M5/applib-ant/Nullable.html |    2 +-
 content/refguide/2.0.0-M5/applib-ant/Pattern.html  |    2 +-
 .../2.0.0-M5/applib-ant/PersistenceCapable.html    |    2 +-
 .../refguide/2.0.0-M5/applib-ant/PrimaryKey.html   |    2 +-
 .../2.0.0-M5/applib-ant/XmlJavaTypeAdapter.html    |    2 +-
 .../2.0.0-M5/applib-ant/XmlRootElement.html        |    2 +-
 content/refguide/2.0.0-M5/applib-ant/about.html    |    2 +-
 .../2.0.0-M5/applib-ant/about/hooks/examples.html  |    2 +-
 .../refguide/2.0.0-M5/applib-ant/about/jdo.html    |    2 +-
 .../refguide/2.0.0-M5/applib-ant/about/jee.html    |    2 +-
 .../refguide/2.0.0-M5/applib-ant/about/jpa.html    |    2 +-
 .../refguide/2.0.0-M5/applib-ant/about/main.html   |    2 +-
 .../refguide/2.0.0-M5/applib-ant/about/other.html  |    2 +-
 .../2.0.0-M5/applib-ant/about/partial.html         |    2 +-
 .../refguide/2.0.0-M5/applib-classes/about.html    |    2 +-
 .../refguide/2.0.0-M5/applib-classes/events.html   |    2 +-
 .../applib-classes/events/domainevent.html         |    2 +-
 .../applib-classes/events/lifecycleevent.html      |    2 +-
 .../2.0.0-M5/applib-classes/events/uievent.html    |    2 +-
 .../refguide/2.0.0-M5/applib-classes/layout.html   |    2 +-
 .../2.0.0-M5/applib-classes/layout/menubars.html   |    2 +-
 .../applib-classes/layout/object-layout.html       |    2 +-
 .../2.0.0-M5/applib-classes/mixees-and-mixins.html |    2 +-
 .../applib-classes/non-persisted-objects.html      |    2 +-
 .../roles-mixins-contributees/contributee.html     |    2 +-
 .../roles-mixins-contributees/mixins.html          |    2 +-
 content/refguide/2.0.0-M5/applib-classes/spec.html |    2 +-
 .../refguide/2.0.0-M5/applib-classes/utility.html  |    2 +-
 .../2.0.0-M5/applib-classes/value-types.html       |    2 +-
 .../refguide/2.0.0-M5/applib-methods/about.html    |    2 +-
 .../2.0.0-M5/applib-methods/lifecycle.html         |    2 +-
 .../2.0.0-M5/applib-methods/lifecycle/created.html |    2 +-
 .../2.0.0-M5/applib-methods/lifecycle/loaded.html  |    2 +-
 .../applib-methods/lifecycle/persisted.html        |    2 +-
 .../applib-methods/lifecycle/persisting.html       |    2 +-
 .../applib-methods/lifecycle/removing.html         |    2 +-
 .../2.0.0-M5/applib-methods/lifecycle/updated.html |    2 +-
 .../applib-methods/lifecycle/updating.html         |    2 +-
 .../refguide/2.0.0-M5/applib-methods/prefixes.html |    2 +-
 .../applib-methods/prefixes/autoComplete.html      |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/choices.html  |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/default.html  |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/disable.html  |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/get.html      |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/hide.html     |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/set.html      |    2 +-
 .../2.0.0-M5/applib-methods/prefixes/validate.html |    2 +-
 .../refguide/2.0.0-M5/applib-methods/ui-hints.html |    2 +-
 .../2.0.0-M5/applib-methods/ui-hints/cssClass.html |    2 +-
 .../2.0.0-M5/applib-methods/ui-hints/iconName.html |    2 +-
 .../2.0.0-M5/applib-methods/ui-hints/layout.html   |    2 +-
 .../2.0.0-M5/applib-methods/ui-hints/title.html    |    2 +-
 content/refguide/2.0.0-M5/applib-svc/about.html    |    2 +-
 ...ag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg |   14 +-
 .../2.0.0-M5/applib/index/AbstractViewModel.html   |    2 +-
 .../refguide/2.0.0-M5/applib/index/Identifier.html |    2 +-
 .../2.0.0-M5/applib/index/IsisModuleApplib.html    |    2 +-
 .../applib/index/RecreatableDomainObject.html      |    2 +-
 .../refguide/2.0.0-M5/applib/index/ViewModel.html  |    2 +-
 .../adapters/AbstractValueSemanticsProvider.html   |    2 +-
 .../applib/index/adapters/DefaultsProvider.html    |    2 +-
 .../applib/index/adapters/EncoderDecoder.html      |    2 +-
 .../applib/index/adapters/EncodingException.html   |    2 +-
 .../2.0.0-M5/applib/index/adapters/Parser.html     |    2 +-
 .../applib/index/adapters/ParsingException.html    |    2 +-
 .../index/adapters/ValueSemanticsProvider.html     |    2 +-
 .../2.0.0-M5/applib/index/annotation/Action.html   |    2 +-
 .../applib/index/annotation/ActionLayout.html      |    2 +-
 .../applib/index/annotation/BookmarkPolicy.html    |    2 +-
 .../2.0.0-M5/applib/index/annotation/Bounding.html |    2 +-
 .../applib/index/annotation/Collection.html        |    2 +-
 .../applib/index/annotation/CollectionLayout.html  |    2 +-
 .../applib/index/annotation/Defaulted.html         |    2 +-
 .../applib/index/annotation/DomainObject.html      |    2 +-
 .../index/annotation/DomainObjectLayout.html       |    2 +-
 .../applib/index/annotation/DomainService.html     |    2 +-
 .../index/annotation/DomainServiceLayout.html      |    2 +-
 .../annotation/DomainServiceLayout~MenuBar.html    |    2 +-
 .../2.0.0-M5/applib/index/annotation/Editing.html  |    2 +-
 .../applib/index/annotation/EntityChangeKind.html  |    2 +-
 .../applib/index/annotation/EqualByContent.html    |    2 +-
 .../2.0.0-M5/applib/index/annotation/Facets.html   |    2 +-
 .../2.0.0-M5/applib/index/annotation/HomePage.html |    2 +-
 .../applib/index/annotation/InteractionScope.html  |    2 +-
 .../applib/index/annotation/LabelPosition.html     |    2 +-
 .../applib/index/annotation/MemberOrder.html       |    2 +-
 .../applib/index/annotation/MinLength.html         |    2 +-
 .../2.0.0-M5/applib/index/annotation/Module.html   |    2 +-
 .../2.0.0-M5/applib/index/annotation/Nature.html   |    2 +-
 .../applib/index/annotation/NatureOfService.html   |    2 +-
 .../applib/index/annotation/Navigable.html         |    2 +-
 .../applib/index/annotation/Optionality.html       |    2 +-
 .../applib/index/annotation/OrderPrecedence.html   |    2 +-
 .../applib/index/annotation/Parameter.html         |    2 +-
 .../applib/index/annotation/ParameterLayout.html   |    2 +-
 .../applib/index/annotation/Programmatic.html      |    2 +-
 .../applib/index/annotation/Projecting.html        |    2 +-
 .../applib/index/annotation/PromptStyle.html       |    2 +-
 .../2.0.0-M5/applib/index/annotation/Property.html |    2 +-
 .../applib/index/annotation/PropertyLayout.html    |    2 +-
 .../applib/index/annotation/Publishing.html        |    2 +-
 .../2.0.0-M5/applib/index/annotation/Redirect.html |    2 +-
 .../applib/index/annotation/RenderDay.html         |    2 +-
 .../applib/index/annotation/Repainting.html        |    2 +-
 .../applib/index/annotation/RestrictTo.html        |    2 +-
 .../applib/index/annotation/SemanticsOf.html       |    2 +-
 .../2.0.0-M5/applib/index/annotation/Snapshot.html |    2 +-
 .../2.0.0-M5/applib/index/annotation/Title.html    |    2 +-
 .../2.0.0-M5/applib/index/annotation/Value.html    |    2 +-
 .../2.0.0-M5/applib/index/annotation/Where.html    |    2 +-
 .../hooks/ActionLayout_010-examples-and-usage.html |    2 +-
 .../hooks/ActionLayout_021-promptStyle.html        |    2 +-
 .../hooks/ActionLayout_022-position.html           |    2 +-
 .../hooks/ActionLayout_023-describedAs.html        |    2 +-
 .../hooks/ActionLayout_024-cssClass.html           |    2 +-
 .../hooks/ActionLayout_025-cssClassFa.html         |    2 +-
 .../hooks/ActionLayout_026-bookmarking.html        |    2 +-
 .../annotation/hooks/ActionLayout_027-hidden.html  |    2 +-
 .../annotation/hooks/ActionLayout_028-named.html   |    2 +-
 .../hooks/ActionLayout_029-redirect.html           |    2 +-
 .../hooks/Action_010-examples-and-usage.html       |    2 +-
 .../annotation/hooks/Action_021-associating.html   |    2 +-
 .../hooks/Action_022-action-semantics.html         |    2 +-
 .../hooks/Action_023-deployment-modes.html         |    2 +-
 .../annotation/hooks/Action_024-domain-events.html |    2 +-
 .../hooks/Action_025-execution-publishing.html     |    2 +-
 .../hooks/Action_026-command-processing.html       |    2 +-
 .../hooks/Action_027-collection-types.html         |    2 +-
 .../annotation/hooks/Action_030-see-also.html      |    2 +-
 .../CollectionLayout_010-examples-and-usage.html   |    2 +-
 .../hooks/CollectionLayout_021-defaultView.html    |    2 +-
 .../hooks/CollectionLayout_022-paged.html          |    2 +-
 .../hooks/CollectionLayout_023-describedAs.html    |    2 +-
 .../hooks/CollectionLayout_024-sortedBy.html       |    2 +-
 .../hooks/CollectionLayout_025-cssClass.html       |    2 +-
 .../hooks/CollectionLayout_026-named.html          |    2 +-
 .../hooks/CollectionLayout_027-hidden.html         |    2 +-
 .../hooks/Collection_010-examples-and-usage.html   |    2 +-
 .../hooks/Collection_021_domainEvent.html          |    2 +-
 .../annotation/hooks/Collection_022_hidden.html    |    2 +-
 .../annotation/hooks/Collection_023_typeOf.html    |    2 +-
 .../DomainObjectLayout_010-examples-and-usage.html |    2 +-
 .../hooks/DomainObjectLayout_021-describedAs.html  |    2 +-
 .../hooks/DomainObjectLayout_022-cssClass.html     |    2 +-
 .../hooks/DomainObjectLayout_023-cssClassFa.html   |    2 +-
 .../hooks/DomainObjectLayout_024-named.html        |    2 +-
 .../hooks/DomainObjectLayout_025-bookmarking.html  |    2 +-
 .../hooks/DomainObjectLayout_026-paged.html        |    2 +-
 .../hooks/DomainObjectLayout_027-ui-events.html    |    2 +-
 .../hooks/DomainObject_010-examples-and-usage.html |    2 +-
 .../hooks/DomainObject_021-objectType.html         |    2 +-
 .../annotation/hooks/DomainObject_022-nature.html  |    2 +-
 .../annotation/hooks/DomainObject_023-editing.html |    2 +-
 .../hooks/DomainObject_024-domain-events.html      |    2 +-
 .../hooks/DomainObject_025-lifecycle-events.html   |    2 +-
 .../DomainObject_026-entityChangePublishing.html   |    2 +-
 .../hooks/DomainObject_027-bounding.html           |    2 +-
 .../DomainObject_028-autoCompleteRepository.html   |    2 +-
 .../hooks/DomainObject_029-mixinMethod.html        |    2 +-
 .../hooks/DomainObject_040-see-also.html           |    2 +-
 ...DomainServiceLayout_010-examples-and-usage.html |    2 +-
 .../hooks/DomainServiceLayout_021-menuBar.html     |    2 +-
 .../hooks/DomainServiceLayout_022-named.html       |    2 +-
 .../DomainService_010-examples-and-usage.html      |    2 +-
 .../hooks/DomainService_021-objectType.html        |    2 +-
 .../annotation/hooks/DomainService_022-nature.html |    2 +-
 .../hooks/Facets_010-examples-and-usage.html       |    2 +-
 .../hooks/HomePage_010-examples-and-usage.html     |    2 +-
 .../InteractionScope_010-examples-and-usage.html   |    2 +-
 .../hooks/MemberOrder_010-examples-and-usage.html  |    2 +-
 .../hooks/MinLength_010-examples-and-usage.html    |    2 +-
 .../ParameterLayout_010-examples-and-usage.html    |    2 +-
 .../hooks/ParameterLayout_021-labelPosition.html   |    2 +-
 .../hooks/ParameterLayout_022-multiLine.html       |    2 +-
 .../hooks/ParameterLayout_023-describedAs.html     |    2 +-
 .../hooks/ParameterLayout_024-cssClass.html        |    2 +-
 .../hooks/ParameterLayout_025-renderDay.html       |    2 +-
 .../hooks/ParameterLayout_026-named.html           |    2 +-
 .../hooks/ParameterLayout_027-typicalLength.html   |    2 +-
 .../hooks/Parameter_010-examples-and-usage.html    |    2 +-
 .../hooks/Parameter_021-optionality.html           |    2 +-
 .../annotation/hooks/Parameter_022-maxLength.html  |    2 +-
 .../hooks/Parameter_023-mustSatisfy.html           |    2 +-
 .../hooks/Parameter_024-regexPattern.html          |    2 +-
 .../annotation/hooks/Parameter_025-fileAccept.html |    2 +-
 .../hooks/Programmatic_010-examples-and-usage.html |    2 +-
 .../PropertyLayout_010-examples-and-usage.html     |    2 +-
 .../hooks/PropertyLayout_021_labelPosition.html    |    2 +-
 .../hooks/PropertyLayout_022_promptStyle.html      |    2 +-
 .../hooks/PropertyLayout_023_multiLine.html        |    2 +-
 .../hooks/PropertyLayout_024_navigable.html        |    2 +-
 .../hooks/PropertyLayout_025_describedAs.html      |    2 +-
 .../hooks/PropertyLayout_026_cssClass.html         |    2 +-
 .../hooks/PropertyLayout_027_renderDay.html        |    2 +-
 .../hooks/PropertyLayout_028_repainting.html       |    2 +-
 .../annotation/hooks/PropertyLayout_029_named.html |    2 +-
 .../hooks/PropertyLayout_030_hidden.html           |    2 +-
 .../hooks/PropertyLayout_31_typicalLength.html     |    2 +-
 .../hooks/Property_010-examples-and-usage.html     |    2 +-
 .../annotation/hooks/Property_021-optionality.html |    2 +-
 .../annotation/hooks/Property_022-editing.html     |    2 +-
 .../annotation/hooks/Property_023-maxLength.html   |    2 +-
 .../annotation/hooks/Property_024-mustSatisfy.html |    2 +-
 .../annotation/hooks/Property_025-projecting.html  |    2 +-
 .../hooks/Property_026-domain-events.html          |    2 +-
 .../hooks/Property_027-execution-publishing.html   |    2 +-
 .../hooks/Property_028-command-processing.html     |    2 +-
 .../hooks/Property_029-regexPattern.html           |    2 +-
 .../annotation/hooks/Property_030-snapshot.html    |    2 +-
 .../annotation/hooks/Property_031-fileAccept.html  |    2 +-
 .../annotation/hooks/Property_033-hidden.html      |    2 +-
 .../hooks/Title_010-examples-and-usage.html        |    2 +-
 .../client/RepresentationTypeSimplifiedV2.html     |    2 +-
 .../applib/index/client/SuppressionType.html       |    2 +-
 .../2.0.0-M5/applib/index/clock/VirtualClock.html  |    2 +-
 .../applib/index/domain/DomainObjectList.html      |    2 +-
 .../applib/index/events/EventObjectBase.html       |    2 +-
 .../index/events/domain/AbstractDomainEvent.html   |    2 +-
 .../index/events/domain/ActionDomainEvent.html     |    2 +-
 .../index/events/domain/CollectionDomainEvent.html |    2 +-
 .../index/events/domain/PropertyDomainEvent.html   |    2 +-
 .../events/lifecycle/AbstractLifecycleEvent.html   |    2 +-
 .../index/events/lifecycle/ObjectCreatedEvent.html |    2 +-
 .../index/events/lifecycle/ObjectLoadedEvent.html  |    2 +-
 .../events/lifecycle/ObjectPersistedEvent.html     |    2 +-
 .../events/lifecycle/ObjectPersistingEvent.html    |    2 +-
 .../events/lifecycle/ObjectRemovingEvent.html      |    2 +-
 .../index/events/lifecycle/ObjectUpdatedEvent.html |    2 +-
 .../events/lifecycle/ObjectUpdatingEvent.html      |    2 +-
 .../applib/index/events/ui/AbstractUiEvent.html    |    2 +-
 .../applib/index/events/ui/CssClassUiEvent.html    |    2 +-
 .../applib/index/events/ui/IconUiEvent.html        |    2 +-
 .../applib/index/events/ui/LayoutUiEvent.html      |    2 +-
 .../applib/index/events/ui/TitleUiEvent.html       |    2 +-
 .../index/exceptions/RecoverableException.html     |    2 +-
 .../index/exceptions/TranslatableException.html    |    2 +-
 .../index/exceptions/UnrecoverableException.html   |    2 +-
 .../unrecoverable/DomainModelException.html        |    2 +-
 .../unrecoverable/MetaModelException.html          |    2 +-
 .../unrecoverable/NoAuthenticatorException.html    |    2 +-
 .../unrecoverable/ObjectNotFoundException.html     |    2 +-
 .../unrecoverable/ObjectPersistenceException.html  |    2 +-
 .../unrecoverable/PersistFailedException.html      |    2 +-
 .../unrecoverable/ReflectiveActionException.html   |    2 +-
 .../unrecoverable/RepositoryException.html         |    2 +-
 .../unrecoverable/UnexpectedCallException.html     |    2 +-
 .../unrecoverable/UnknownTypeException.html        |    2 +-
 .../refguide/2.0.0-M5/applib/index/graph/Edge.html |    2 +-
 .../2.0.0-M5/applib/index/graph/SimpleEdge.html    |    2 +-
 .../2.0.0-M5/applib/index/graph/Vertex.html        |    2 +-
 .../applib/index/graph/tree/LazyTreeNode.html      |    2 +-
 .../applib/index/graph/tree/TreeAdapter.html       |    2 +-
 .../2.0.0-M5/applib/index/graph/tree/TreeNode.html |    2 +-
 .../2.0.0-M5/applib/index/graph/tree/TreePath.html |    2 +-
 .../applib/index/graph/tree/TreeState.html         |    2 +-
 .../2.0.0-M5/applib/index/id/HasLogicalType.html   |    2 +-
 .../2.0.0-M5/applib/index/id/LogicalType.html      |    2 +-
 .../applib/index/jaxb/DataTypeFactory.html         |    2 +-
 .../applib/index/jaxb/JavaSqlJaxbAdapters.html     |    2 +-
 .../JavaSqlXMLGregorianCalendarMarshalling.html    |    2 +-
 .../applib/index/jaxb/JavaTimeJaxbAdapters.html    |    2 +-
 .../JavaTimeXMLGregorianCalendarMarshalling.html   |    2 +-
 .../applib/index/jaxb/JavaUtilJaxbAdapters.html    |    2 +-
 .../applib/index/jaxb/JodaTimeJaxbAdapters.html    |    2 +-
 .../JodaTimeXMLGregorianCalendarMarshalling.html   |    2 +-
 .../index/jaxb/PersistentEntitiesAdapter.html      |    2 +-
 .../applib/index/jaxb/PersistentEntityAdapter.html |    2 +-
 .../applib/index/jaxb/PrimitiveJaxbAdapters.html   |    2 +-
 .../index/layout/component/ActionLayoutData.html   |    2 +-
 .../layout/component/ActionLayoutDataOwner.html    |    2 +-
 .../layout/component/CollectionLayoutData.html     |    2 +-
 .../component/CollectionLayoutDataOwner.html       |    2 +-
 .../index/layout/component/CssClassFaPosition.html |    2 +-
 .../layout/component/DomainObjectLayoutData.html   |    2 +-
 .../component/DomainObjectLayoutDataOwner.html     |    2 +-
 .../applib/index/layout/component/FieldSet.html    |    2 +-
 .../index/layout/component/FieldSetOwner.html      |    2 +-
 .../index/layout/component/HasBookmarking.html     |    2 +-
 .../applib/index/layout/component/HasCssClass.html |    2 +-
 .../index/layout/component/HasCssClassFa.html      |    2 +-
 .../index/layout/component/HasDescribedAs.html     |    2 +-
 .../applib/index/layout/component/HasHidden.html   |    2 +-
 .../applib/index/layout/component/HasNamed.html    |    2 +-
 .../index/layout/component/MemberRegion.html       |    2 +-
 .../index/layout/component/MemberRegionOwner.html  |    2 +-
 .../applib/index/layout/component/Owned.html       |    2 +-
 .../applib/index/layout/component/Owner.html       |    2 +-
 .../index/layout/component/PropertyLayoutData.html |    2 +-
 .../layout/component/ServiceActionLayoutData.html  |    2 +-
 .../component/ServiceActionLayoutDataOwner.html    |    2 +-
 .../2.0.0-M5/applib/index/layout/grid/Grid.html    |    2 +-
 .../applib/index/layout/grid/GridAbstract.html     |    2 +-
 .../index/layout/grid/bootstrap3/BS3ClearFix.html  |    2 +-
 .../layout/grid/bootstrap3/BS3ClearFixHidden.html  |    2 +-
 .../layout/grid/bootstrap3/BS3ClearFixVisible.html |    2 +-
 .../index/layout/grid/bootstrap3/BS3Col.html       |    2 +-
 .../index/layout/grid/bootstrap3/BS3Element.html   |    2 +-
 .../layout/grid/bootstrap3/BS3ElementAbstract.html |    2 +-
 .../index/layout/grid/bootstrap3/BS3Grid.html      |    2 +-
 .../index/layout/grid/bootstrap3/BS3Row.html       |    2 +-
 .../layout/grid/bootstrap3/BS3RowContent.html      |    2 +-
 .../layout/grid/bootstrap3/BS3RowContentOwner.html |    2 +-
 .../index/layout/grid/bootstrap3/BS3RowOwner.html  |    2 +-
 .../index/layout/grid/bootstrap3/BS3Tab.html       |    2 +-
 .../index/layout/grid/bootstrap3/BS3TabGroup.html  |    2 +-
 .../layout/grid/bootstrap3/BS3TabGroupOwner.html   |    2 +-
 .../index/layout/grid/bootstrap3/BS3TabOwner.html  |    2 +-
 .../index/layout/grid/bootstrap3/HasCssId.html     |    2 +-
 .../applib/index/layout/grid/bootstrap3/Size.html  |    2 +-
 .../index/layout/grid/bootstrap3/SizeSpan.html     |    2 +-
 .../index/layout/grid/bootstrap3/WithinGrid.html   |    2 +-
 .../2.0.0-M5/applib/index/layout/links/Link.html   |    2 +-
 .../applib/index/layout/menubars/HasNamed.html     |    2 +-
 .../applib/index/layout/menubars/Menu.html         |    2 +-
 .../applib/index/layout/menubars/MenuBar.html      |    2 +-
 .../applib/index/layout/menubars/MenuBars.html     |    2 +-
 .../index/layout/menubars/MenuBarsAbstract.html    |    2 +-
 .../applib/index/layout/menubars/MenuSection.html  |    2 +-
 .../index/layout/menubars/bootstrap3/BS3Menu.html  |    2 +-
 .../layout/menubars/bootstrap3/BS3MenuBar.html     |    2 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.html    |    2 +-
 .../layout/menubars/bootstrap3/BS3MenuSection.html |    2 +-
 .../2.0.0-M5/applib/index/mixins/dto/Dto.html      |    2 +-
 .../applib/index/mixins/dto/DtoMixinConstants.html |    2 +-
 .../applib/index/mixins/dto/Dto_downloadXml.html   |    2 +-
 .../applib/index/mixins/dto/Dto_downloadXsd.html   |    2 +-
 .../index/mixins/dto/hooks/Dto_see-also.html       |    2 +-
 .../index/mixins/layout/LayoutMixinConstants.html  |    2 +-
 .../mixins/layout/Object_downloadLayoutXml.html    |    2 +-
 .../hooks/Object_downloadLayoutXml_see-also.html   |    2 +-
 .../metamodel/Object_downloadMetamodelXml.html     |    2 +-
 .../mixins/metamodel/Object_objectIdentifier.html  |    2 +-
 .../index/mixins/metamodel/Object_objectType.html  |    2 +-
 .../mixins/metamodel/Object_rebuildMetamodel.html  |    2 +-
 .../hooks/Object_rebuildMetamodel_see-also.html    |    2 +-
 .../index/mixins/rest/Object_openRestApi.html      |    2 +-
 .../rest/hooks/Object_openRestApi_see-also.html    |    2 +-
 .../applib/index/mixins/security/HasUsername.html  |    2 +-
 .../index/mixins/system/DomainChangeRecord.html    |    2 +-
 .../DomainChangeRecord_openTargetObject.html       |    2 +-
 .../system/DomainChangeRecord~ChangeType.html      |    2 +-
 .../index/mixins/system/HasInteractionId.html      |    2 +-
 .../index/mixins/system/HasTransactionId.html      |    2 +-
 .../system/hooks/HasInteractionId_see-also.html    |    2 +-
 .../applib/index/mixins/updates/OnUpdatedAt.html   |    2 +-
 .../applib/index/mixins/updates/OnUpdatedBy.html   |    2 +-
 .../index/mixins/updates/OnUpdatedByAndAt.html     |    2 +-
 .../updates/hooks/WithUpdatedAt_usage-notes.html   |    2 +-
 .../hooks/WithUpdatedByAndAt_usage-notes.html      |    2 +-
 .../updates/hooks/WithUpdatedBy_usage-notes.html   |    2 +-
 .../applib/index/query/AllInstancesQuery.html      |    2 +-
 .../2.0.0-M5/applib/index/query/NamedQuery.html    |    2 +-
 .../2.0.0-M5/applib/index/query/Query.html         |    2 +-
 .../2.0.0-M5/applib/index/query/QueryRange.html    |    2 +-
 .../services/acceptheader/AcceptHeaderService.html |    2 +-
 .../AcceptHeaderService_010-implementation.html    |    2 +-
 ...AcceptHeaderService_020-examples-and-usage.html |    2 +-
 .../index/services/appfeat/ApplicationFeature.html |    2 +-
 .../services/appfeat/ApplicationFeatureId.html     |    2 +-
 .../appfeat/ApplicationFeatureRepository.html      |    2 +-
 .../services/appfeat/ApplicationFeatureSort.html   |    2 +-
 .../services/appfeat/ApplicationMemberSort.html    |    2 +-
 ...cationFeatureRepository_010-implementation.html |    2 +-
 ...onFeatureRepository_020-examples-and-usage.html |    2 +-
 .../applib/index/services/bookmark/Bookmark.html   |    2 +-
 .../index/services/bookmark/BookmarkHolder.html    |    2 +-
 .../services/bookmark/BookmarkHolder_lookup.html   |    2 +-
 .../services/bookmark/BookmarkHolder_object.html   |    2 +-
 .../index/services/bookmark/BookmarkService.html   |    2 +-
 .../hooks/BookmarkService_010-implementation.html  |    2 +-
 .../BookmarkService_020-examples-and-usage.html    |    2 +-
 .../services/bookmarkui/BookmarkUiService.html     |    2 +-
 .../BookmarkUiService_010-implementation.html      |    2 +-
 .../BookmarkUiService_020-examples-and-usage.html  |    2 +-
 .../applib/index/services/clock/ClockService.html  |    2 +-
 .../hooks/ClockService_010-implementation.html     |    2 +-
 .../hooks/ClockService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/command/Command.html     |    2 +-
 .../services/command/CommandExecutorService.html   |    2 +-
 .../services/command/CommandOutcomeHandler.html    |    2 +-
 .../CommandExecutorService_010-implementation.html |    2 +-
 ...mandExecutorService_020-examples-and-usage.html |    2 +-
 .../index/services/commanddto/HasCommandDto.html   |    2 +-
 .../conmap/ContentMappingServiceForCommandDto.html |    2 +-
 .../ContentMappingServiceForCommandsDto.html       |    2 +-
 .../services/commanddto/conmap/UserDataKeys.html   |    2 +-
 .../commanddto/processor/CommandDtoProcessor.html  |    2 +-
 .../CommandDtoProcessorForActionAbstract.html      |    2 +-
 .../CommandDtoProcessorForPropertyAbstract.html    |    2 +-
 ...mandDtoProcessorService_010-implementation.html |    2 +-
 ...DtoProcessorService_020-examples-and-usage.html |    2 +-
 .../processor/spi/CommandDtoProcessorService.html  |    2 +-
 .../spi/CommandDtoProcessorServiceIdentity.html    |    2 +-
 .../index/services/confview/ConfigurationMenu.html |    2 +-
 .../services/confview/ConfigurationProperty.html   |    2 +-
 .../confview/ConfigurationViewService.html         |    2 +-
 .../ConfigurationMenu_010-implementation.html      |    2 +-
 .../ConfigurationMenu_020-examples-and-usage.html  |    2 +-
 ...onfigurationViewService_010-implementation.html |    2 +-
 ...gurationViewService_020-examples-and-usage.html |    2 +-
 .../services/conmap/ContentMappingService.html     |    2 +-
 .../ContentMappingService_010-implementation.html  |    2 +-
 ...ntentMappingService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/email/EmailService.html  |    2 +-
 .../hooks/EmailService_010-implementation.html     |    2 +-
 .../hooks/EmailService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/error/ErrorDetails.html  |    2 +-
 .../services/error/ErrorReportingService.html      |    2 +-
 .../applib/index/services/error/SimpleTicket.html  |    2 +-
 .../applib/index/services/error/Ticket.html        |    2 +-
 .../ErrorReportingService_010-implementation.html  |    2 +-
 ...rorReportingService_020-examples-and-usage.html |    2 +-
 .../index/services/eventbus/EventBusService.html   |    2 +-
 .../hooks/EventBusService_010-implementation.html  |    2 +-
 .../EventBusService_020-examples-and-usage.html    |    2 +-
 .../applib/index/services/exceprecog/Category.html |    2 +-
 .../services/exceprecog/ExceptionRecognizer.html   |    2 +-
 .../exceprecog/ExceptionRecognizerAbstract.html    |    2 +-
 .../exceprecog/ExceptionRecognizerForType.html     |    2 +-
 .../exceprecog/ExceptionRecognizerService.html     |    2 +-
 .../index/services/exceprecog/Recognition.html     |    2 +-
 ...eptionRecognizerService_010-implementation.html |    2 +-
 ...onRecognizerService_020-examples-and-usage.html |    2 +-
 .../ExceptionRecognizer_010-implementation.html    |    2 +-
 ...ExceptionRecognizer_020-examples-and-usage.html |    2 +-
 .../index/services/factory/FactoryService.html     |    2 +-
 .../hooks/FactoryService_010-implementation.html   |    2 +-
 .../FactoryService_020-examples-and-usage.html     |    2 +-
 .../index/services/grid/GridLoaderService.html     |    2 +-
 .../applib/index/services/grid/GridService.html    |    2 +-
 .../index/services/grid/GridSystemService.html     |    2 +-
 .../GridLoaderService_010-implementation.html      |    2 +-
 .../GridLoaderService_020-examples-and-usage.html  |    2 +-
 .../grid/hooks/GridService_010-implementation.html |    2 +-
 .../hooks/GridService_020-examples-and-usage.html  |    2 +-
 .../GridSystemService_010-implementation.html      |    2 +-
 .../GridSystemService_020-examples-and-usage.html  |    2 +-
 .../applib/index/services/health/Health.html       |    2 +-
 .../index/services/health/HealthCheckService.html  |    2 +-
 .../HealthCheckService_010-implementation.html     |    2 +-
 .../HealthCheckService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/hint/HintIdProvider.html |    2 +-
 .../applib/index/services/hint/HintStore.html      |    2 +-
 .../hooks/HintIdProvider_010-implementation.html   |    2 +-
 .../HintIdProvider_020-examples-and-usage.html     |    2 +-
 .../hint/hooks/HintStore_010-implementation.html   |    2 +-
 .../hooks/HintStore_020-examples-and-usage.html    |    2 +-
 .../services/homepage/HomePageResolverService.html |    2 +-
 ...HomePageResolverService_010-implementation.html |    2 +-
 ...PageResolverService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/i18n/LocaleProvider.html |    2 +-
 .../2.0.0-M5/applib/index/services/i18n/Mode.html  |    2 +-
 .../index/services/i18n/TranslatableString.html    |    2 +-
 .../index/services/i18n/TranslationService.html    |    2 +-
 .../index/services/i18n/TranslationsResolver.html  |    2 +-
 .../hooks/LocaleProvider_010-implementation.html   |    2 +-
 .../LocaleProvider_020-examples-and-usage.html     |    2 +-
 .../TranslationService_010-implementation.html     |    2 +-
 .../TranslationService_020-examples-and-usage.html |    2 +-
 .../TranslationsResolver_010-implementation.html   |    2 +-
 ...ranslationsResolver_020-examples-and-usage.html |    2 +-
 .../index/services/iactn/ActionInvocation.html     |    2 +-
 .../applib/index/services/iactn/Execution.html     |    2 +-
 .../index/services/iactn/ExecutionContext.html     |    2 +-
 .../applib/index/services/iactn/Interaction.html   |    2 +-
 .../index/services/iactn/InteractionContext.html   |    2 +-
 .../applib/index/services/iactn/PropertyEdit.html  |    2 +-
 .../applib/index/services/iactn/SequenceType.html  |    2 +-
 .../iactn/hooks/Execution_010-implementation.html  |    2 +-
 .../hooks/Execution_020-examples-and-usage.html    |    2 +-
 .../InteractionContext_010-implementation.html     |    2 +-
 .../InteractionContext_020-examples-and-usage.html |    2 +-
 .../hooks/Interaction_010-implementation.html      |    2 +-
 .../hooks/Interaction_020-examples-and-usage.html  |    2 +-
 .../index/services/inject/ServiceInjector.html     |    2 +-
 .../hooks/ServiceInjector_010-implementation.html  |    2 +-
 .../ServiceInjector_020-examples-and-usage.html    |    2 +-
 .../applib/index/services/jaxb/JaxbService.html    |    2 +-
 .../jaxb/hooks/JaxbService_010-implementation.html |    2 +-
 .../hooks/JaxbService_020-examples-and-usage.html  |    2 +-
 .../index/services/layout/LayoutService.html       |    2 +-
 .../index/services/layout/LayoutServiceMenu.html   |    2 +-
 .../applib/index/services/layout/Style.html        |    2 +-
 .../LayoutServiceMenu_010-implementation.html      |    2 +-
 .../LayoutServiceMenu_020-examples-and-usage.html  |    2 +-
 .../hooks/LayoutService_010-implementation.html    |    2 +-
 .../LayoutService_020-examples-and-usage.html      |    2 +-
 .../index/services/linking/DeepLinkService.html    |    2 +-
 .../hooks/DeepLinkService_010-implementation.html  |    2 +-
 .../DeepLinkService_020-examples-and-usage.html    |    2 +-
 .../index/services/menu/MenuBarsLoaderService.html |    2 +-
 .../index/services/menu/MenuBarsService.html       |    2 +-
 .../MenuBarsLoaderService_010-implementation.html  |    2 +-
 ...nuBarsLoaderService_020-examples-and-usage.html |    2 +-
 .../hooks/MenuBarsService_010-implementation.html  |    2 +-
 .../MenuBarsService_020-examples-and-usage.html    |    2 +-
 .../index/services/message/MessageService.html     |    2 +-
 .../hooks/MessageService_010-implementation.html   |    2 +-
 .../MessageService_020-examples-and-usage.html     |    2 +-
 .../applib/index/services/metamodel/BeanSort.html  |    2 +-
 .../applib/index/services/metamodel/Config.html    |    2 +-
 .../index/services/metamodel/DomainMember.html     |    2 +-
 .../index/services/metamodel/DomainModel.html      |    2 +-
 .../index/services/metamodel/MetaModelService.html |    2 +-
 .../services/metamodel/MetaModelServiceMenu.html   |    2 +-
 .../MetaModelServiceMenu_010-implementation.html   |    2 +-
 ...etaModelServiceMenu_020-examples-and-usage.html |    2 +-
 .../hooks/MetaModelService_010-implementation.html |    2 +-
 .../MetaModelService_020-examples-and-usage.html   |    2 +-
 .../index/services/metrics/MetricsService.html     |    2 +-
 .../hooks/MetricsService_010-implementation.html   |    2 +-
 .../MetricsService_020-examples-and-usage.html     |    2 +-
 .../services/publishing/log/CommandLogger.html     |    2 +-
 .../publishing/log/EntityChangesLogger.html        |    2 +-
 .../publishing/log/EntityPropertyChangeLogger.html |    2 +-
 .../services/publishing/log/ExecutionLogger.html   |    2 +-
 .../services/publishing/spi/CommandSubscriber.html |    2 +-
 .../services/publishing/spi/EntityChanges.html     |    2 +-
 .../publishing/spi/EntityChangesSubscriber.html    |    2 +-
 .../publishing/spi/EntityPropertyChange.html       |    2 +-
 .../spi/EntityPropertyChangeSubscriber.html        |    2 +-
 .../publishing/spi/ExecutionSubscriber.html        |    2 +-
 .../CommandSubscriber_010-implementation.html      |    2 +-
 .../CommandSubscriber_020-examples-and-usage.html  |    2 +-
 ...EntityChangesSubscriber_010-implementation.html |    2 +-
 ...tyChangesSubscriber_020-examples-and-usage.html |    2 +-
 ...ropertyChangeSubscriber_010-implementation.html |    2 +-
 ...rtyChangeSubscriber_020-examples-and-usage.html |    2 +-
 .../ExecutionSubscriber_010-implementation.html    |    2 +-
 ...ExecutionSubscriber_020-examples-and-usage.html |    2 +-
 .../queryresultscache/MethodReferences.html        |    2 +-
 .../queryresultscache/QueryResultsCache.html       |    2 +-
 .../QueryResultsCacheControl.html                  |    2 +-
 ...ueryResultsCacheControl_010-implementation.html |    2 +-
 ...ResultsCacheControl_020-examples-and-usage.html |    2 +-
 .../QueryResultsCache_010-implementation.html      |    2 +-
 .../QueryResultsCache_020-examples-and-usage.html  |    2 +-
 .../registry/InstanceByPriorityComparator.html     |    2 +-
 .../index/services/registry/ServiceRegistry.html   |    2 +-
 .../hooks/ServiceRegistry_010-implementation.html  |    2 +-
 .../ServiceRegistry_020-examples-and-usage.html    |    2 +-
 .../index/services/repository/EntityState.html     |    2 +-
 .../services/repository/RepositoryService.html     |    2 +-
 .../RepositoryService_010-implementation.html      |    2 +-
 .../RepositoryService_020-examples-and-usage.html  |    2 +-
 .../index/services/routing/RoutingService.html     |    2 +-
 .../hooks/RoutingService_010-implementation.html   |    2 +-
 .../RoutingService_020-examples-and-usage.html     |    2 +-
 .../index/services/scratchpad/Scratchpad.html      |    2 +-
 .../hooks/Scratchpad_010-implementation.html       |    2 +-
 .../hooks/Scratchpad_020-examples-and-usage.html   |    2 +-
 .../services/session/SessionLoggingService.html    |    2 +-
 .../session/SessionLoggingServiceLogging.html      |    2 +-
 .../SessionLoggingService_010-implementation.html  |    2 +-
 ...ssionLoggingService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/sudo/SudoService.html    |    2 +-
 .../SudoServiceListener_010-implementation.html    |    2 +-
 ...SudoServiceListener_020-examples-and-usage.html |    2 +-
 .../sudo/hooks/SudoService_010-implementation.html |    2 +-
 .../hooks/SudoService_020-examples-and-usage.html  |    2 +-
 .../applib/index/services/swagger/Format.html      |    2 +-
 .../index/services/swagger/SwaggerService.html     |    2 +-
 .../applib/index/services/swagger/Visibility.html  |    2 +-
 .../hooks/SwaggerService_010-implementation.html   |    2 +-
 .../SwaggerService_020-examples-and-usage.html     |    2 +-
 .../TableColumnOrderForCollectionTypeAbstract.html |    2 +-
 .../services/tablecol/TableColumnOrderService.html |    2 +-
 ...TableColumnOrderService_010-implementation.html |    2 +-
 ...eColumnOrderService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/title/TitleService.html  |    2 +-
 .../hooks/TitleService_010-implementation.html     |    2 +-
 .../hooks/TitleService_020-examples-and-usage.html |    2 +-
 .../services/urlencoding/UrlEncodingService.html   |    2 +-
 ...rlEncodingServiceUsingBaseEncodingAbstract.html |    2 +-
 .../UrlEncodingService_010-implementation.html     |    2 +-
 .../UrlEncodingService_020-examples-and-usage.html |    2 +-
 .../applib/index/services/user/RoleMemento.html    |    2 +-
 .../applib/index/services/user/UserMemento.html    |    2 +-
 .../applib/index/services/user/UserService.html    |    2 +-
 .../user/hooks/UserService_010-implementation.html |    2 +-
 .../hooks/UserService_020-examples-and-usage.html  |    2 +-
 .../services/userprof/UserProfileService.html      |    2 +-
 .../UserProfileService_010-implementation.html     |    2 +-
 .../UserProfileService_020-examples-and-usage.html |    2 +-
 .../services/userreg/EmailNotificationService.html |    2 +-
 .../applib/index/services/userreg/UserDetails.html |    2 +-
 .../services/userreg/UserRegistrationService.html  |    2 +-
 .../userreg/events/EmailEventAbstract.html         |    2 +-
 .../userreg/events/EmailRegistrationEvent.html     |    2 +-
 .../userreg/events/PasswordResetEvent.html         |    2 +-
 ...mailNotificationService_010-implementation.html |    2 +-
 ...NotificationService_020-examples-and-usage.html |    2 +-
 ...UserRegistrationService_010-implementation.html |    2 +-
 ...RegistrationService_020-examples-and-usage.html |    2 +-
 .../index/services/wrapper/DisabledException.html  |    2 +-
 .../index/services/wrapper/HiddenException.html    |    2 +-
 .../index/services/wrapper/InvalidException.html   |    2 +-
 .../index/services/wrapper/WrapperFactory.html     |    2 +-
 .../index/services/wrapper/WrappingObject.html     |    2 +-
 .../services/wrapper/control/AsyncControl.html     |    2 +-
 .../services/wrapper/control/ControlAbstract.html  |    2 +-
 .../services/wrapper/control/ExceptionHandler.html |    2 +-
 .../wrapper/control/ExceptionHandlerAbstract.html  |    2 +-
 .../services/wrapper/control/ExecutionMode.html    |    2 +-
 .../services/wrapper/control/SyncControl.html      |    2 +-
 .../index/services/wrapper/events/AccessEvent.html |    2 +-
 .../wrapper/events/ActionArgumentEvent.html        |    2 +-
 .../wrapper/events/ActionInvocationEvent.html      |    2 +-
 .../wrapper/events/ActionUsabilityEvent.html       |    2 +-
 .../wrapper/events/ActionVisibilityEvent.html      |    2 +-
 .../wrapper/events/CollectionAccessEvent.html      |    2 +-
 .../wrapper/events/CollectionAddToEvent.html       |    2 +-
 .../wrapper/events/CollectionMethodEvent.html      |    2 +-
 .../wrapper/events/CollectionRemoveFromEvent.html  |    2 +-
 .../wrapper/events/CollectionUsabilityEvent.html   |    2 +-
 .../services/wrapper/events/InteractionEvent.html  |    2 +-
 .../services/wrapper/events/ObjectTitleEvent.html  |    2 +-
 .../wrapper/events/ObjectValidityEvent.html        |    2 +-
 .../wrapper/events/ObjectVisibilityEvent.html      |    2 +-
 .../services/wrapper/events/ParseValueEvent.html   |    2 +-
 .../wrapper/events/PropertyAccessEvent.html        |    2 +-
 .../wrapper/events/PropertyModifyEvent.html        |    2 +-
 .../wrapper/events/PropertyUsabilityEvent.html     |    2 +-
 .../wrapper/events/PropertyVisibilityEvent.html    |    2 +-
 .../wrapper/events/ProposedHolderEvent.html        |    2 +-
 .../services/wrapper/events/UsabilityEvent.html    |    2 +-
 .../services/wrapper/events/ValidityEvent.html     |    2 +-
 .../services/wrapper/events/VisibilityEvent.html   |    2 +-
 .../hooks/WrapperFactory_010-implementation.html   |    2 +-
 .../WrapperFactory_020-examples-and-usage.html     |    2 +-
 .../wrapper/listeners/InteractionAdapter.html      |    2 +-
 .../wrapper/listeners/InteractionListener.html     |    2 +-
 .../applib/index/services/xactn/TransactionId.html |    2 +-
 .../index/services/xactn/TransactionService.html   |    2 +-
 .../index/services/xactn/TransactionState.html     |    2 +-
 .../services/xactn/TransactionalProcessor.html     |    2 +-
 .../TransactionService_010-implementation.html     |    2 +-
 .../TransactionService_020-examples-and-usage.html |    2 +-
 .../TransactionalProcessor_010-implementation.html |    2 +-
 ...nsactionalProcessor_020-examples-and-usage.html |    2 +-
 .../applib/index/services/xml/XmlService.html      |    2 +-
 .../xml/hooks/XmlService_010-implementation.html   |    2 +-
 .../hooks/XmlService_020-examples-and-usage.html   |    2 +-
 .../services/xmlsnapshot/XmlSnapshotService.html   |    2 +-
 .../xmlsnapshot/XmlSnapshotService~Snapshot.html   |    2 +-
 .../XmlSnapshotService~Snapshot~Builder.html       |    2 +-
 .../XmlSnapshotService_010-implementation.html     |    2 +-
 .../XmlSnapshotService_020-examples-and-usage.html |    2 +-
 .../snapshot/SnapshottableWithInclusions.html      |    2 +-
 .../applib/index/spec/AbstractSpecification.html   |    2 +-
 .../applib/index/spec/AbstractSpecification2.html  |    2 +-
 .../2.0.0-M5/applib/index/spec/Specification.html  |    2 +-
 .../2.0.0-M5/applib/index/spec/Specification2.html |    2 +-
 .../applib/index/spec/SpecificationAnd.html        |    2 +-
 .../applib/index/spec/SpecificationNot.html        |    2 +-
 .../applib/index/spec/SpecificationOr.html         |    2 +-
 .../applib/index/types/DescriptionType.html        |    2 +-
 .../applib/index/types/MemberIdentifierType.html   |    2 +-
 .../applib/index/types/TargetActionType.html       |    2 +-
 .../applib/index/types/TargetClassType.html        |    2 +-
 .../refguide/2.0.0-M5/applib/index/util/Enums.html |    2 +-
 .../2.0.0-M5/applib/index/util/Equality.html       |    2 +-
 .../2.0.0-M5/applib/index/util/Hashing.html        |    2 +-
 .../2.0.0-M5/applib/index/util/JaxbUtil.html       |    2 +-
 .../applib/index/util/ObjectContracts.html         |    2 +-
 .../2.0.0-M5/applib/index/util/ReasonBuffer.html   |    2 +-
 .../2.0.0-M5/applib/index/util/ReasonBuffer2.html  |    2 +-
 .../2.0.0-M5/applib/index/util/Reasons.html        |    2 +-
 .../2.0.0-M5/applib/index/util/TitleBuffer.html    |    2 +-
 .../applib/index/util/TitleBufferException.html    |    2 +-
 .../2.0.0-M5/applib/index/util/ToString.html       |    2 +-
 .../applib/index/util/hooks/Enums_examples.html    |    2 +-
 .../hooks/ObjectContracts_examples-and-usage.html  |    2 +-
 .../applib/index/util/schema/ChangesDtoUtils.html  |    2 +-
 .../applib/index/util/schema/CommandDtoUtils.html  |    2 +-
 .../applib/index/util/schema/CommonDtoUtils.html   |    2 +-
 .../index/util/schema/InteractionDtoUtils.html     |    2 +-
 .../index/util/schema/MemberExecutionDtoUtils.html |    2 +-
 .../refguide/2.0.0-M5/applib/index/value/Blob.html |    2 +-
 .../refguide/2.0.0-M5/applib/index/value/Clob.html |    2 +-
 .../2.0.0-M5/applib/index/value/HasHtml.html       |    2 +-
 .../applib/index/value/LocalResourcePath.html      |    2 +-
 .../2.0.0-M5/applib/index/value/Markup.html        |    2 +-
 .../applib/index/value/NamedWithMimeType.html      |    2 +-
 .../applib/index/value/OpenUrlStrategy.html        |    2 +-
 .../2.0.0-M5/applib/index/value/Password.html      |    2 +-
 .../applib/index/value/hooks/Blob_usage-notes.html |    2 +-
 .../applib/index/value/hooks/Clob_usage-notes.html |    2 +-
 .../2.0.0-M5/commons/index/collections/Can.html    |    2 +-
 .../commons/index/collections/Cardinality.html     |    2 +-
 .../2.0.0-M5/commons/index/functional/Result.html  |    2 +-
 .../index/resource/ResourceCoordinates.html        |    2 +-
 content/refguide/2.0.0-M5/config/about.html        |    2 +-
 .../application-specific/application-css.html      |    2 +-
 .../2.0.0-M5/config/section-hooks/Other~post.html  |    2 +-
 .../2.0.0-M5/config/section-hooks/Other~pre.html   |    2 +-
 .../config/section-hooks/datanucleus~post.html     |    2 +-
 .../config/section-hooks/datanucleus~pre.html      |    2 +-
 .../config/section-hooks/isis.applib~post.html     |    2 +-
 .../config/section-hooks/isis.applib~pre.html      |    2 +-
 .../section-hooks/isis.core.config~post.html       |    2 +-
 .../config/section-hooks/isis.core.config~pre.html |    2 +-
 .../isis.core.meta-model.introspector~post.html    |    2 +-
 .../isis.core.meta-model.introspector~pre.html     |    2 +-
 .../isis.core.meta-model.validator~post.html       |    2 +-
 .../isis.core.meta-model.validator~pre.html        |    2 +-
 .../section-hooks/isis.core.meta-model~post.html   |    2 +-
 .../section-hooks/isis.core.meta-model~pre.html    |    2 +-
 .../isis.core.runtime-services~post.html           |    2 +-
 .../isis.core.runtime-services~pre.html            |    2 +-
 .../section-hooks/isis.core.runtime~post.html      |    2 +-
 .../section-hooks/isis.core.runtime~pre.html       |    2 +-
 .../config/section-hooks/isis.extensions~post.html |    2 +-
 .../config/section-hooks/isis.extensions~pre.html  |    2 +-
 .../config/section-hooks/isis.incubator~post.html  |    2 +-
 .../config/section-hooks/isis.incubator~pre.html   |    2 +-
 .../config/section-hooks/isis.legacy~post.html     |    2 +-
 .../config/section-hooks/isis.legacy~pre.html      |    2 +-
 .../config/section-hooks/isis.mappings~post.html   |    2 +-
 .../config/section-hooks/isis.mappings~pre.html    |    2 +-
 .../isis.persistence.schema~post.html              |    2 +-
 .../section-hooks/isis.persistence.schema~pre.html |    2 +-
 .../section-hooks/isis.security.shiro~post.html    |    2 +-
 .../section-hooks/isis.security.shiro~pre.html     |    2 +-
 .../section-hooks/isis.security.spring~post.html   |    2 +-
 .../section-hooks/isis.security.spring~pre.html    |    2 +-
 .../config/section-hooks/isis.subdomains~post.html |    2 +-
 .../config/section-hooks/isis.subdomains~pre.html  |    2 +-
 .../config/section-hooks/isis.testing~post.html    |    2 +-
 .../config/section-hooks/isis.testing~pre.html     |    2 +-
 .../section-hooks/isis.value-types~post.html       |    2 +-
 .../config/section-hooks/isis.value-types~pre.html |    2 +-
 .../isis.viewer.restfulobjects~post.html           |    2 +-
 .../isis.viewer.restfulobjects~pre.html            |    2 +-
 .../section-hooks/isis.viewer.wicket~post.html     |    2 +-
 .../section-hooks/isis.viewer.wicket~pre.html      |    2 +-
 .../config/section-hooks/resteasy~post.html        |    2 +-
 .../config/section-hooks/resteasy~pre.html         |    2 +-
 .../2.0.0-M5/config/section-hooks/spring~post.html |    2 +-
 .../2.0.0-M5/config/section-hooks/spring~pre.html  |    2 +-
 .../refguide/2.0.0-M5/config/sections/Other.html   |    2 +-
 .../2.0.0-M5/config/sections/datanucleus.html      |    2 +-
 .../2.0.0-M5/config/sections/isis.applib.html      |    2 +-
 .../2.0.0-M5/config/sections/isis.core.config.html |    2 +-
 .../config/sections/isis.core.meta-model.html      |    2 +-
 .../isis.core.meta-model.introspector.html         |    2 +-
 .../sections/isis.core.meta-model.validator.html   |    2 +-
 .../sections/isis.core.runtime-services.html       |    2 +-
 .../config/sections/isis.core.runtime.html         |    2 +-
 .../2.0.0-M5/config/sections/isis.extensions.html  |    2 +-
 .../2.0.0-M5/config/sections/isis.legacy.html      |    2 +-
 .../config/sections/isis.persistence.schema.html   |    2 +-
 .../config/sections/isis.security.shiro.html       |    2 +-
 .../config/sections/isis.security.spring.html      |    2 +-
 .../2.0.0-M5/config/sections/isis.testing.html     |    2 +-
 .../2.0.0-M5/config/sections/isis.value-types.html |    2 +-
 .../sections/isis.viewer.restfulobjects.html       |    2 +-
 .../config/sections/isis.viewer.wicket.html        |    2 +-
 .../2.0.0-M5/config/sections/resteasy.html         |    2 +-
 .../DataSourceIntrospectionService.html            |    2 +-
 .../interaction/session/InteractionFactory.html    |    2 +-
 .../services/command/CommandDtoFactory.html        |    2 +-
 .../services/ixn/InteractionDtoFactory.html        |    2 +-
 .../services/publishing/CommandPublisher.html      |    2 +-
 .../services/publishing/ExecutionPublisher.html    |    2 +-
 .../transaction/TransactionServiceSpring.html      |    2 +-
 .../runtimeservices/xml/XmlServiceDefault.html     |    2 +-
 .../security/authentication/Authentication.html    |    2 +-
 .../authentication/AuthenticationRequest.html      |    2 +-
 .../security/authentication/Authenticator.html     |    2 +-
 .../index/security/authorization/Authorizor.html   |    2 +-
 .../changetracking/EntityChangeTracker.html        |    2 +-
 .../changetracking/EntityChangeTrackerDefault.html |    2 +-
 .../changetracking/EntityChangesPublisher.html     |    2 +-
 .../EntityPropertyChangePublisher.html             |    2 +-
 .../events/TransactionAfterCompletionEvent.html    |    2 +-
 .../commandlog/impl/CommandSubscriberForJdo.html   |    2 +-
 .../impl/IsisModuleExtCommandLogImpl.html          |    2 +-
 .../impl/mixins/HasInteractionId_command.html      |    2 +-
 .../mixins/HasUsername_recentCommandsByUser.html   |    2 +-
 .../commandlog/impl/ui/CommandServiceMenu.html     |    2 +-
 .../primary/IsisModuleExtCommandReplayPrimary.html |    2 +-
 .../primary/config/PrimaryConfig.html              |    2 +-
 .../primary/mixins/Object_openOnSecondary.html     |    2 +-
 .../primary/restapi/CommandRetrievalService.html   |    2 +-
 .../primary/ui/CommandReplayOnPrimaryService.html  |    2 +-
 .../IsisModuleExtCommandReplaySecondary.html       |    2 +-
 .../commandreplay/secondary/SecondaryStatus.html   |    2 +-
 .../secondary/analyser/CommandReplayAnalyser.html  |    2 +-
 .../analyser/CommandReplayAnalyserException.html   |    2 +-
 .../analyser/CommandReplayAnalyserResult.html      |    2 +-
 .../analysis/CommandReplayAnalysisService.html     |    2 +-
 .../secondary/clock/TickingClockService.html       |    2 +-
 .../secondary/config/SecondaryConfig.html          |    2 +-
 .../executor/CommandExecutorServiceWithTime.html   |    2 +-
 .../secondary/fetch/CommandFetcher.html            |    2 +-
 .../secondary/job/ReplicateAndReplayJob.html       |    2 +-
 .../secondary/job/SecondaryStatusData.html         |    2 +-
 .../jobcallables/ReplicateAndRunCommands.html      |    2 +-
 .../secondary/mixins/CommandJdo_exclude.html       |    2 +-
 .../secondary/mixins/CommandJdo_replayQueue.html   |    2 +-
 .../secondary/mixins/Object_openOnPrimary.html     |    2 +-
 .../spi/ReplayCommandExecutionController.html      |    2 +-
 .../ui/CommandReplayOnSecondaryService.html        |    2 +-
 .../index/cors/impl/IsisModuleExtCorsImpl.html     |    2 +-
 .../fullcalendar/applib/CalendarEventable.html     |    2 +-
 .../index/fullcalendar/applib/Calendarable.html    |    2 +-
 .../applib/IsisModuleExtFullCalendarApplib.html    |    2 +-
 .../spi/CalendarableDereferencingService.html      |    2 +-
 .../fullcalendar/applib/value/CalendarEvent.html   |    2 +-
 .../ui/component/IsisModuleExtFullCalendarUi.html  |    2 +-
 .../hsqldbmgr/dom/IsisModuleExtHsqldbMgr.html      |    2 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.html  |    2 +-
 .../applib/IsisModuleExtJaxRsClientApplib.html     |    2 +-
 .../jaxrsclient/applib/client/JaxRsClient.html     |    2 +-
 .../jaxrsclient/applib/client/JaxRsResponse.html   |    2 +-
 .../applib/IsisModuleIncModelApplib.html           |    2 +-
 .../modelannotation/applib/annotation/Model.html   |    2 +-
 .../metamodel/IsisModuleExtModelAnnotation.html    |    2 +-
 .../SupportingMethodValidatorRefinerFactory.html   |    2 +-
 .../services/IncubatorMetaModelPlugin.html         |    2 +-
 .../index/quartz/IsisModuleExtQuartzImpl.html      |    2 +-
 .../index/quartz/context/JobExecutionData.html     |    2 +-
 .../spring/AutowiringSpringBeanJobFactory.html     |    2 +-
 .../restclient/ActionParameterListBuilder.html     |    2 +-
 .../index/restclient/IsisModuleExtRestClient.html  |    2 +-
 .../index/restclient/ResponseDigest.html           |    2 +-
 .../extensions/index/restclient/RestfulClient.html |    5 +-
 .../index/restclient/RestfulClientConfig.html      |    2 +-
 .../index/restclient/RestfulClientException.html   |    2 +-
 .../index/restclient/auth/BasicAuthFilter.html     |    2 +-
 .../restclient/log/ClientConversationFilter.html   |    2 +-
 .../restclient/log/ClientConversationLogger.html   |    2 +-
 .../index/secman/api/IsisModuleExtSecmanApi.html   |    2 +-
 .../index/secman/api/SecmanConfiguration.html      |    2 +-
 .../extensions/index/secman/api/SecurityRealm.html |    2 +-
 .../secman/api/SecurityRealmCharacteristic.html    |    2 +-
 .../index/secman/api/SecurityRealmService.html     |    2 +-
 .../secman/api/authorizor/AuthorizorSecman.html    |    2 +-
 .../api/encryption/PasswordEncryptionService.html  |    2 +-
 .../encryption/PasswordEncryptionServiceNone.html  |    2 +-
 .../index/secman/api/events/UserCreatedEvent.html  |    2 +-
 .../api/permission/ApplicationPermission.html      |    2 +-
 .../api/permission/ApplicationPermissionMode.html  |    2 +-
 .../ApplicationPermissionRepository.html           |    2 +-
 .../api/permission/ApplicationPermissionRule.html  |    2 +-
 .../api/permission/ApplicationPermissionValue.html |    2 +-
 .../permission/ApplicationPermissionValueSet.html  |    2 +-
 .../permission/PermissionsEvaluationService.html   |    2 +-
 .../PermissionsEvaluationServiceAbstract.html      |    2 +-
 ...PermissionsEvaluationServiceAllowBeatsVeto.html |    2 +-
 ...PermissionsEvaluationServiceVetoBeatsAllow.html |    2 +-
 .../index/secman/api/role/ApplicationRole.html     |    2 +-
 .../secman/api/role/ApplicationRoleRepository.html |    2 +-
 .../secman/api/tenancy/ApplicationTenancy.html     |    2 +-
 .../api/tenancy/ApplicationTenancyEvaluator.html   |   55 +-
 .../api/tenancy/ApplicationTenancyRepository.html  |    2 +-
 .../index/secman/api/tenancy/HasAtPath.html        |    2 +-
 .../index/secman/api/user/AccountType.html         |    2 +-
 .../index/secman/api/user/ApplicationUser.html     |   49 +-
 .../secman/api/user/ApplicationUserRepository.html |    2 +-
 .../secman/api/user/ApplicationUserStatus.html     |    2 +-
 .../IsisModuleExtSecmanEncryptionJbcrypt.html      |    2 +-
 .../PasswordEncryptionServiceUsingJBcrypt.html     |    2 +-
 .../jdo/IsisModuleExtSecmanPersistenceJdo.html     |    2 +-
 .../secman/jdo/seed/SeedSecurityModuleService.html |    2 +-
 .../jdo/seed/SeedUsersAndRolesFixtureScript.html   |    2 +-
 .../secman/jdo/seed/scripts/GlobalTenancy.html     |    2 +-
 ...xtFixturesFixtureResultsRoleAndPermissions.html |    2 +-
 .../IsisExtSecmanAdminRoleAndPermissions.html      |    2 +-
 .../jdo/seed/scripts/IsisExtSecmanAdminUser.html   |    2 +-
 .../IsisExtSecmanFixtureRoleAndPermissions.html    |    2 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.html |    2 +-
 .../jpa/IsisModuleExtSecmanPersistenceJpa.html     |    2 +-
 .../secman/jpa/seed/SeedSecurityModuleService.html |    2 +-
 .../jpa/seed/SeedUsersAndRolesFixtureScript.html   |    2 +-
 .../secman/jpa/seed/scripts/GlobalTenancy.html     |    2 +-
 ...xtFixturesFixtureResultsRoleAndPermissions.html |    2 +-
 .../IsisExtSecmanAdminRoleAndPermissions.html      |    2 +-
 .../jpa/seed/scripts/IsisExtSecmanAdminUser.html   |    2 +-
 .../IsisExtSecmanFixtureRoleAndPermissions.html    |    2 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.html |    2 +-
 ...tyModuleAppUserRegistrationServiceAbstract.html |    2 +-
 .../secman/model/IsisModuleExtSecmanModel.html     |    2 +-
 .../index/secman/model/dom/user/MeService.html     |    2 +-
 .../shiro/IsisModuleExtSecmanRealmShiro.html       |    2 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.html       |    2 +-
 .../services/SecurityRealmServiceUsingShiro.html   |    2 +-
 .../index/secman/shiro/util/ShiroUtils.html        |    2 +-
 .../realm/impl/IsisLdapContextFactory.html         |    2 +-
 .../shirorealmldap/realm/impl/IsisLdapRealm.html   |    2 +-
 .../impl/IsisModuleExtShiroRealmLdapImpl.html      |    2 +-
 .../ui/IsisModuleExtExcelDownloadUi.html           |    2 +-
 .../ui/components/CollectionContentsAsExcel.html   |    2 +-
 .../CollectionContentsAsExcelFactory.html          |    2 +-
 .../pdfjs/applib/annotations/PdfJsViewer.html      |    2 +-
 .../wicket/pdfjs/applib/config/PdfJsConfig.html    |    2 +-
 .../viewer/wicket/pdfjs/applib/config/Scale.html   |    2 +-
 .../pdfjs/applib/spi/PdfJsViewerAdvisor.html       |    2 +-
 .../wicket/pdfjs/ui/IsisModuleExtPdfjsUi.html      |    2 +-
 .../jdo/applib/IsisModulePersistenceJdoApplib.html |    2 +-
 .../jdo/applib/services/JdoSupportService.html     |    2 +-
 .../JdoSupportService_010-examples-and-usage.html  |    2 +-
 .../jdo/datanucleus/IsisModuleJdoDatanucleus.html  |    2 +-
 .../changetracking/JdoLifecycleListener.html       |    2 +-
 .../jdo/datanucleus/dialect/DnJdoDialect.html      |    2 +-
 .../mixins/Persistable_datanucleusIdLong.html      |    2 +-
 .../mixins/Persistable_datanucleusVersionLong.html |    2 +-
 .../Persistable_datanucleusVersionTimestamp.html   |    2 +-
 .../mixins/Persistable_downloadJdoMetadata.html    |    2 +-
 .../applib/IsisBookmarkConverter.html              |    2 +-
 .../applib/IsisLocalResourcePathConverter.html     |    2 +-
 .../typeconverters/applib/IsisMarkupConverter.html |    2 +-
 .../applib/IsisPasswordConverter.html              |    2 +-
 .../JavaAwtBufferedImageByteArrayConverter.html    |    2 +-
 .../schema/v2/IsisChangesDtoConverter.html         |    2 +-
 .../schema/v2/IsisCommandDtoConverter.html         |    2 +-
 .../schema/v2/IsisInteractionDtoConverter.html     |    2 +-
 .../schema/v2/IsisOidDtoConverter.html             |    2 +-
 .../time/IsoOffsetTimeConverter.html               |    2 +-
 .../time/IsoZonedDateTimeConverter.html            |    2 +-
 .../applib/ByteArrayBlobRdbmsMapping.html          |    2 +-
 .../valuetypes/applib/IsisBlobMapping.html         |    2 +-
 .../valuetypes/applib/IsisClobMapping.html         |    2 +-
 .../JpaEntityInjectionPointResolver.html           |    2 +-
 .../jpa/applib/services/JpaSupportService.html     |    2 +-
 .../jpa/eclipselink/IsisModuleJpaEclipselink.html  |    2 +-
 content/refguide/2.0.0-M5/schema/about.html        |    2 +-
 content/refguide/2.0.0-M5/schema/aim.html          |    2 +-
 content/refguide/2.0.0-M5/schema/chg.html          |    2 +-
 content/refguide/2.0.0-M5/schema/cmd.html          |    2 +-
 content/refguide/2.0.0-M5/schema/common.html       |    2 +-
 .../2.0.0-M5/schema/index/IsisModuleSchema.html    |    2 +-
 content/refguide/2.0.0-M5/schema/ixn.html          |    2 +-
 content/refguide/2.0.0-M5/schema/mml.html          |    2 +-
 .../index/bypass/IsisModuleSecurityBypass.html     |    2 +-
 .../bypass/authentication/AuthenticatorBypass.html |    2 +-
 .../bypass/authorization/AuthorizorBypass.html     |    2 +-
 .../index/keycloak/IsisModuleSecurityKeycloak.html |    2 +-
 .../authentication/AuthenticatorKeycloak.html      |    2 +-
 .../index/keycloak/webmodule/KeycloakFilter.html   |    2 +-
 .../keycloak/webmodule/WebModuleKeycloak.html      |    2 +-
 .../index/shiro/IsisModuleSecurityShiro.html       |    2 +-
 .../shiro/authentication/AuthenticatorShiro.html   |    2 +-
 .../index/shiro/authorization/AuthorizorShiro.html |    2 +-
 .../index/shiro/authorization/IsisPermission.html  |    2 +-
 .../authorization/IsisPermissionResolver.html      |    2 +-
 .../index/shiro/webmodule/WebModuleShiro.html      |    2 +-
 .../index/spring/IsisModuleSecuritySpring.html     |    2 +-
 .../spring/authentication/AuthenticatorSpring.html |    2 +-
 .../spring/webmodule/SpringSecurityFilter.html     |    2 +-
 .../spring/webmodule/WebModuleSpringSecurity.html  |    2 +-
 .../subdomains/index/base/applib/Chained.html      |    2 +-
 .../subdomains/index/base/applib/Dflt.html         |    2 +-
 .../applib/IsisModuleSubdomainsBaseApplib.html     |    2 +-
 .../subdomains/index/base/applib/PowerType.html    |    2 +-
 .../subdomains/index/base/applib/Titled.html       |    2 +-
 .../subdomains/index/base/applib/TitledEnum.html   |    2 +-
 .../base/applib/services/BaseServicesModule.html   |    2 +-
 .../applib/services/calendar/CalendarService.html  |    2 +-
 .../index/base/applib/types/DescriptionType.html   |    2 +-
 .../index/base/applib/types/FqcnType.html          |    2 +-
 .../index/base/applib/types/MoneyType.html         |    2 +-
 .../index/base/applib/types/NameType.html          |    2 +-
 .../index/base/applib/types/NotesType.html         |    2 +-
 .../base/applib/types/ObjectIdentifierType.html    |    2 +-
 .../index/base/applib/types/PercentageType.html    |    2 +-
 .../index/base/applib/types/ProperNameType.html    |    2 +-
 .../index/base/applib/types/ReferenceType.html     |    2 +-
 .../index/base/applib/types/TitleType.html         |    2 +-
 .../index/base/applib/types/UrlTemplateType.html   |    2 +-
 .../index/base/applib/types/UserNameType.html      |    2 +-
 .../index/base/applib/types/XxxType.html           |    2 +-
 .../index/base/applib/utils/ClassUtils.html        |    2 +-
 .../index/base/applib/utils/JodaPeriodUtils.html   |    2 +-
 .../index/base/applib/utils/MathUtils.html         |    2 +-
 .../index/base/applib/utils/MessageUtils.html      |    2 +-
 .../index/base/applib/utils/StringUtils.html       |    2 +-
 .../index/base/applib/utils/TitleBuilder.html      |    2 +-
 .../base/applib/valuetypes/AbstractInterval.html   |    2 +-
 .../base/applib/valuetypes/LocalDateInterval.html  |    2 +-
 .../index/base/applib/valuetypes/VT.html           |    2 +-
 .../index/base/applib/with/WithCodeComparable.html |    2 +-
 .../index/base/applib/with/WithCodeGetter.html     |    2 +-
 .../index/base/applib/with/WithCodeUnique.html     |    2 +-
 .../applib/with/WithDescriptionComparable.html     |    2 +-
 .../base/applib/with/WithDescriptionGetter.html    |    2 +-
 .../base/applib/with/WithDescriptionUnique.html    |    2 +-
 .../index/base/applib/with/WithInterval.html       |    2 +-
 .../base/applib/with/WithIntervalContiguous.html   |    2 +-
 .../base/applib/with/WithIntervalMutable.html      |    2 +-
 .../index/base/applib/with/WithNameComparable.html |    2 +-
 .../index/base/applib/with/WithNameGetter.html     |    2 +-
 .../index/base/applib/with/WithNameUnique.html     |    2 +-
 .../base/applib/with/WithReferenceComparable.html  |    2 +-
 .../base/applib/with/WithReferenceGetter.html      |    2 +-
 .../base/applib/with/WithReferenceUnique.html      |    2 +-
 .../index/base/applib/with/WithSequence.html       |    2 +-
 .../index/base/applib/with/WithStartDate.html      |    2 +-
 .../base/applib/with/WithTitleComparable.html      |    2 +-
 .../index/base/applib/with/WithTitleGetter.html    |    2 +-
 .../index/base/applib/with/WithTitleUnique.html    |    2 +-
 .../applib/IsisModuleSubdomainsExcelApplib.html    |    2 +-
 .../index/excel/applib/dom/AggregationType.html    |    2 +-
 .../excel/applib/dom/ExcelMetaDataEnabled.html     |    2 +-
 .../index/excel/applib/dom/ExcelService.html       |    2 +-
 .../index/excel/applib/dom/HyperLink.html          |    2 +-
 .../index/excel/applib/dom/PivotColumn.html        |    2 +-
 .../index/excel/applib/dom/PivotDecoration.html    |    2 +-
 .../index/excel/applib/dom/PivotRow.html           |    2 +-
 .../index/excel/applib/dom/PivotValue.html         |    2 +-
 .../index/excel/applib/dom/RowHandler.html         |    2 +-
 .../index/excel/applib/dom/WorksheetContent.html   |    2 +-
 .../index/excel/applib/dom/WorksheetSpec.html      |    2 +-
 .../excel/applib/dom/util/AnnotationList.html      |    2 +-
 .../excel/applib/dom/util/AnnotationTriplet.html   |    2 +-
 .../applib/dom/util/ExcelFileBlobConverter.html    |    2 +-
 .../excel/applib/dom/util/ExcelServiceImpl.html    |    2 +-
 .../index/excel/applib/dom/util/Mode.html          |    2 +-
 .../index/excel/applib/dom/util/PivotUtils.html    |    2 +-
 .../index/excel/applib/dom/util/SheetPivoter.html  |    2 +-
 .../index/excel/testing/ExcelFixture.html          |    2 +-
 .../index/excel/testing/ExcelFixture2.html         |    2 +-
 .../excel/testing/ExcelFixtureRowHandler.html      |    2 +-
 .../excel/testing/ExcelFixtureWorkbookHandler.html |    2 +-
 .../excel/testing/FixtureAwareRowHandler.html      |    2 +-
 .../testing/IsisModuleSubdomainsExcelTesting.html  |    2 +-
 .../applib/IsisModuleSubdomainsSpringApplib.html   |    2 +-
 .../spring/applib/service/BeanDescriptor.html      |    2 +-
 .../index/spring/applib/service/ContextBeans.html  |    2 +-
 .../spring/applib/service/SpringBeansService.html  |    2 +-
 .../IsisModuleSubdomainsXDocReportApplib.html      |    2 +-
 .../xdocreport/applib/service/OutputType.html      |    2 +-
 .../xdocreport/applib/service/XDocReportModel.html |    2 +-
 .../applib/service/XDocReportService.html          |    2 +-
 .../applib/IsisModuleTestingFakeDataApplib.html    |    2 +-
 .../services/AbstractRandomValueGenerator.html     |    2 +-
 .../index/fakedata/applib/services/Addresses.html  |    2 +-
 .../fakedata/applib/services/BigDecimals.html      |    2 +-
 .../fakedata/applib/services/BigIntegers.html      |    2 +-
 .../index/fakedata/applib/services/Books.html      |    2 +-
 .../index/fakedata/applib/services/Booleans.html   |    2 +-
 .../index/fakedata/applib/services/Bytes.html      |    2 +-
 .../index/fakedata/applib/services/Chars.html      |    2 +-
 .../fakedata/applib/services/Collections.html      |    2 +-
 .../index/fakedata/applib/services/Comms.html      |    2 +-
 .../fakedata/applib/services/CreditCards.html      |    2 +-
 .../index/fakedata/applib/services/Doubles.html    |    2 +-
 .../index/fakedata/applib/services/Enums.html      |    2 +-
 .../fakedata/applib/services/FakeDataService.html  |    2 +-
 .../index/fakedata/applib/services/Floats.html     |    2 +-
 .../index/fakedata/applib/services/Integers.html   |    2 +-
 .../index/fakedata/applib/services/IsisBlobs.html  |    2 +-
 .../index/fakedata/applib/services/IsisClobs.html  |    2 +-
 .../fakedata/applib/services/IsisPasswords.html    |    2 +-
 .../fakedata/applib/services/J8DateTimes.html      |    2 +-
 .../fakedata/applib/services/J8LocalDates.html     |    2 +-
 .../index/fakedata/applib/services/J8Periods.html  |    2 +-
 .../fakedata/applib/services/JavaSqlDates.html     |    2 +-
 .../applib/services/JavaSqlTimestamps.html         |    2 +-
 .../fakedata/applib/services/JavaUtilDates.html    |    2 +-
 .../fakedata/applib/services/JodaDateTimes.html    |    2 +-
 .../fakedata/applib/services/JodaLocalDates.html   |    2 +-
 .../fakedata/applib/services/JodaPeriods.html      |    2 +-
 .../index/fakedata/applib/services/Longs.html      |    2 +-
 .../index/fakedata/applib/services/Lorem.html      |    2 +-
 .../index/fakedata/applib/services/Names.html      |    2 +-
 .../index/fakedata/applib/services/Shorts.html     |    2 +-
 .../index/fakedata/applib/services/Strings.html    |    2 +-
 .../index/fakedata/applib/services/Urls.html       |    2 +-
 .../index/fakedata/applib/services/Uuids.html      |    2 +-
 .../h2console/ui/IsisModuleTestingH2ConsoleUi.html |    2 +-
 .../index/h2console/ui/services/H2ManagerMenu.html |    2 +-
 .../h2console/ui/webmodule/WebModuleH2Console.html |    2 +-
 .../applib/ExceptionRecognizerTranslate.html       |    2 +-
 .../applib/IsisIntegrationTestAbstract.html        |    2 +-
 .../applib/IsisInteractionHandler.html             |    2 +-
 .../integtestsupport/applib/ThrowableMatchers.html |    2 +-
 .../applib/swagger/SwaggerExporter.html            |    2 +-
 .../applib/validate/DomainModelValidator.html      |    2 +-
 .../applib/IsisModuleTestingSpecSupportApplib.html |    2 +-
 .../integration/ObjectFactoryForIntegration.html   |    2 +-
 .../testing/index/specsupport/applib/specs/V.html  |    2 +-
 .../IsisModuleTestingUnitTestSupportApplib.html    |    2 +-
 .../applib/bean/AbstractBeanPropertiesTest.html    |    2 +-
 .../bean/FixtureDatumFactoriesForAnyPojo.html      |    2 +-
 .../bean/FixtureDatumFactoriesForApplib.html       |    2 +-
 .../applib/bean/FixtureDatumFactoriesForJoda.html  |    2 +-
 .../applib/bean/FixtureDatumFactoriesForTime.html  |    2 +-
 .../unittestsupport/applib/bean/PojoTester.html    |    2 +-
 .../core/AbstractApplyToAllContractTest.html       |    2 +-
 ...irectionalRelationshipContractTestAbstract.html |    2 +-
 .../applib/core/bidir/Instantiator.html            |    2 +-
 .../applib/core/bidir/InstantiatorSimple.html      |    2 +-
 .../applib/core/bidir/Instantiators.html           |    2 +-
 .../ComparableContractTest_compareTo.html          |    2 +-
 .../core/comparable/ComparableContractTester.html  |    2 +-
 .../unittestsupport/applib/core/files/Files.html   |    2 +-
 .../applib/core/jaxb/JaxbMatchers.html             |    2 +-
 .../applib/core/jmocking/Imposterisers.html        |    2 +-
 .../core/jmocking/InjectIntoJMockAction.html       |    2 +-
 .../applib/core/jmocking/IsisActions.html          |    2 +-
 .../applib/core/jmocking/JMockActions.html         |    2 +-
 .../applib/core/jmocking/JUnitRuleMockery2.html    |    2 +-
 .../applib/core/jmocking/PostponedAction.html      |    2 +-
 .../core/soap/SoapEndpointPublishingRule.html      |    2 +-
 .../applib/core/soap/SoapEndpointSpec.html         |    2 +-
 .../sortedsets/SortedSetsContractTestAbstract.html |    2 +-
 .../applib/core/streams/NullPrintStream.html       |    2 +-
 .../applib/core/utils/CollectUtils.html            |    2 +-
 .../applib/core/utils/IndentPrinter.html           |    2 +-
 .../applib/core/utils/ReflectUtils.html            |    2 +-
 .../applib/core/utils/StringUtils.html             |    2 +-
 .../core/value/ValueTypeContractTestAbstract.html  |    2 +-
 .../applib/dom/assertions/Asserting.html           |    2 +-
 .../applib/dom/matchers/IsisMatchers.html          |    2 +-
 .../dom/privatecons/PrivateConstructorTester.html  |    2 +-
 .../applib/dom/reflect/ReflectUtils.html           |    2 +-
 .../applib/dom/repo/FinderInteraction.html         |    2 +-
 .../applib/IsisModuleValAsciidocApplib.html        |    2 +-
 .../asciidoc/applib/jaxb/AsciiDocJaxbAdapter.html  |    2 +-
 .../index/asciidoc/applib/value/AsciiDoc.html      |    2 +-
 .../metamodel/IsisModuleValAsciidocMetaModel.html  |    2 +-
 .../IsisModuleValAsciidocPersistenceJdoDn5.html    |    2 +-
 .../jdo/dn5/converters/IsisAsciiDocConverter.html  |    2 +-
 .../ui/wkt/IsisModuleValAsciidocUiWkt.html         |    2 +-
 .../applib/IsisModuleValMarkdownApplib.html        |    2 +-
 .../markdown/applib/jaxb/MarkdownJaxbAdapter.html  |    2 +-
 .../index/markdown/applib/value/Converter.html     |    2 +-
 .../metamodel/IsisModuleValMarkdownMetaModel.html  |    2 +-
 .../IsisModuleValMarkdownPersistenceJdoDn5.html    |    2 +-
 .../jdo/dn5/converters/IsisMarkdownConverter.html  |    2 +-
 .../ui/wkt/IsisModuleValMarkdownUiWkt.html         |    2 +-
 .../index/sse/applib/IsisModuleValSseApplib.html   |    2 +-
 .../sse/applib/annotations/ServerSentEvents.html   |    2 +-
 .../index/sse/applib/annotations/SseSource.html    |    2 +-
 .../index/sse/applib/service/SseChannel.html       |    2 +-
 .../index/sse/applib/service/SseService.html       |    2 +-
 .../index/sse/ui/wkt/IsisModuleValSseUiWkt.html    |    2 +-
 .../sse/ui/wkt/services/SseServiceDefault.html     |    2 +-
 .../wkt/webmodule/WebModuleServerSentEvents.html   |    2 +-
 .../IsisModuleViewerRestfulObjectsApplib.html      |    2 +-
 .../restfulobjects/applib/JsonRepresentation.html  |    2 +-
 .../restfulobjects/applib/LinkRepresentation.html  |    2 +-
 .../viewer/index/restfulobjects/applib/Rel.html    |    2 +-
 .../index/restfulobjects/applib/RelDefinition.html |    2 +-
 .../restfulobjects/applib/RepresentationType.html  |    2 +-
 .../restfulobjects/applib/RestfulHttpMethod.html   |    2 +-
 .../restfulobjects/applib/RestfulMediaType.html    |    2 +-
 .../restfulobjects/applib/RestfulRequest.html      |    2 +-
 .../restfulobjects/applib/RestfulResponse.html     |    2 +-
 .../applib/boot/BootstrapResource.html             |    2 +-
 .../AbstractObjectMemberRepresentation.html        |    2 +-
 .../domainobjects/ActionResultRepresentation.html  |    2 +-
 .../DomainObjectMemberRepresentation.html          |    2 +-
 .../domainobjects/DomainObjectRepresentation.html  |    2 +-
 .../applib/domainobjects/DomainObjectResource.html |    2 +-
 .../applib/domainobjects/DomainRepresentation.html |    2 +-
 .../domainobjects/DomainServiceResource.html       |    2 +-
 .../applib/domainobjects/ListRepresentation.html   |    2 +-
 .../domainobjects/ObjectActionRepresentation.html  |    2 +-
 .../ObjectCollectionRepresentation.html            |    2 +-
 .../ObjectPropertyRepresentation.html              |    2 +-
 .../domainobjects/ScalarValueRepresentation.html   |    2 +-
 .../AbstractTypeMemberRepresentation.html          |    2 +-
 .../ActionDescriptionRepresentation.html           |    2 +-
 .../ActionParameterDescriptionRepresentation.html  |    2 +-
 .../CollectionDescriptionRepresentation.html       |    2 +-
 .../domaintypes/DomainTypeRepresentation.html      |    2 +-
 .../applib/domaintypes/DomainTypeResource.html     |    2 +-
 .../PropertyDescriptionRepresentation.html         |    2 +-
 .../TypeActionResultRepresentation.html            |    2 +-
 .../applib/domaintypes/TypeListRepresentation.html |    2 +-
 .../applib/dtos/ScalarValueDtoV2.html              |    2 +-
 .../applib/errors/ErrorRepresentation.html         |    2 +-
 .../applib/health/HealthRepresentation.html        |    2 +-
 .../applib/health/HealthResource.html              |    2 +-
 .../applib/homepage/HomePageRepresentation.html    |    2 +-
 .../applib/homepage/HomePageResource.html          |    2 +-
 .../applib/menubars/MenuBarsResource.html          |    2 +-
 .../applib/user/UserRepresentation.html            |    2 +-
 .../restfulobjects/applib/user/UserResource.html   |    2 +-
 .../restfulobjects/applib/util/JsonMapper.html     |    2 +-
 .../restfulobjects/applib/util/JsonNodeUtils.html  |    2 +-
 .../restfulobjects/applib/util/MediaTypes.html     |    2 +-
 .../index/restfulobjects/applib/util/Parser.html   |    2 +-
 .../index/restfulobjects/applib/util/PathNode.html |    2 +-
 .../applib/util/UrlEncodingUtils.html              |    2 +-
 .../applib/version/VersionRepresentation.html      |    2 +-
 .../applib/version/VersionResource.html            |    2 +-
 ...isModuleViewerRestfulObjectsJaxrsResteasy4.html |    2 +-
 .../conneg/RestfulObjectsJaxbWriterForXml.html     |    2 +-
 .../webmodule/WebModuleJaxrsResteasy4.html         |    2 +-
 .../restfulobjects/rendering/IResourceContext.html |    2 +-
 .../IsisModuleRestfulObjectsRendering.html         |    2 +-
 .../rendering/service/RepresentationService.html   |    2 +-
 .../acceptheader/AcceptHeaderServiceForRest.html   |    2 +-
 .../service/conneg/ContentNegotiationService.html  |    2 +-
 .../conneg/ContentNegotiationServiceAbstract.html  |    2 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.html |    2 +-
 .../ContentNegotiationServiceOrgApacheIsisV1.html  |    2 +-
 .../ContentNegotiationServiceOrgApacheIsisV2.html  |    2 +-
 .../ContentNegotiationServiceXRoDomainType.html    |    2 +-
 ...onServiceForRestfulObjectsV1_0_usage-notes.html |    2 +-
 ...otiationServiceOrgApacheIsisV1_usage-notes.html |    2 +-
 ...otiationServiceOrgApacheIsisV2_usage-notes.html |    2 +-
 ...egotiationServiceXRoDomainType_usage-notes.html |    2 +-
 .../service/swagger/SwaggerServiceMenu.html        |    2 +-
 .../IsisModuleViewerRestfulObjectsViewer.html      |    2 +-
 .../webmodule/auth/AuthenticationStrategy.html     |    2 +-
 .../auth/AuthenticationStrategyAbstract.html       |    2 +-
 .../auth/AuthenticationStrategyBasicAuth.html      |    2 +-
 .../auth/AuthenticationStrategyDefault.html        |    2 +-
 .../wicket/model/IsisModuleViewerWicketModel.html  |    2 +-
 .../index/wicket/ui/IsisModuleViewerWicketUi.html  |    2 +-
 .../viewer/IsisModuleViewerWicketViewer.html       |    2 +-
 .../wicket/viewer/mixins/Object_clearHints.html    |    2 +-
 .../relnotes/2.0.0-M5/2018/2.0.0-M1/mignotes.html  |    2 +-
 .../2018/2.0.0-M1/mignotes/legacy-modules.html     |    2 +-
 .../2018/2.0.0-M1/mignotes/meta-annotations.html   |    2 +-
 .../2018/2.0.0-M1/mignotes/moved-types.html        |    2 +-
 .../2018/2.0.0-M1/mignotes/other-changes.html      |    2 +-
 .../2.0.0-M1/mignotes/removed-annotations.html     |    2 +-
 .../mignotes/removed-configuration-properties.html |    2 +-
 .../2018/2.0.0-M1/mignotes/removed-types.html      |    2 +-
 .../2.0.0-M1/mignotes/updated-annotations.html     |    2 +-
 .../2018/2.0.0-M1/mignotes/updated-classes.html    |    2 +-
 .../relnotes/2.0.0-M5/2018/2.0.0-M1/relnotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2019/2.0.0-M2/relnotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M3/mignotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M3/relnotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M4/mignotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M4/relnotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M5/mignotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M5/relnotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M6/mignotes.html  |    2 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M6/relnotes.html  |    2 +-
 content/relnotes/2.0.0-M5/about.html               |    2 +-
 content/security/2.0.0-M5/about.html               |   21 +-
 content/security/2.0.0-M5/audit-trail/about.html   |   27 +-
 content/security/2.0.0-M5/bypass/about.html        |   21 +-
 content/security/2.0.0-M5/core/about.html          |   21 +-
 content/security/2.0.0-M5/keycloak/about.html      |   21 +-
 .../secman/_images/secman-domain-model.drawio.svg  |    1 +
 .../_images/secman-shiro-architecture.drawio.svg   |    1 +
 .../secman-shiro-delegate-architecture.drawio.svg  |    1 +
 ...s-security-module-realm-with-delegate-realm.PNG |  Bin 45089 -> 0 bytes
 ...iro-to-use-isisaddons-security-module-realm.PNG |  Bin 38713 -> 0 bytes
 content/security/2.0.0-M5/secman/about.html        |  474 +++-
 content/security/2.0.0-M5/secman/api.html          |  490 ----
 .../2.0.0-M5/secman/jbcrypt-encryption.html        |  490 ----
 .../security/2.0.0-M5/secman/jdo-persistence.html  |  499 ----
 .../security/2.0.0-M5/secman/jpa-persistence.html  |  499 ----
 content/security/2.0.0-M5/secman/model.html        |  490 ----
 .../about.html => secman/setting-up.html}          |  407 +++-
 content/security/2.0.0-M5/secman/shiro-realm.html  |  532 -----
 content/security/2.0.0-M5/session-log/about.html   |   21 +-
 .../security/2.0.0-M5/shiro-realm-ldap/about.html  |   21 +-
 .../2.0.0-M5/shiro-realm-ldap/ldap-realm.html      |   21 +-
 content/security/2.0.0-M5/shiro/about.html         |   21 +-
 content/security/2.0.0-M5/spring/about.html        |   21 +-
 .../security/2.0.0-M5/usage-by-isis-viewers.html   |   25 +-
 content/setupguide/2.0.0-M5/about.html             |    2 +-
 content/setupguide/2.0.0-M5/eclipse/about.html     |    2 +-
 content/setupguide/2.0.0-M5/intellij/about.html    |    2 +-
 .../2.0.0-M5/intellij/hints-and-tips.html          |    2 +-
 content/sitemap-comguide.xml                       |   32 +-
 content/sitemap-conguide.xml                       |   22 +-
 content/sitemap-core.xml                           |   32 +-
 content/sitemap-docs.xml                           |   64 +-
 content/sitemap-extensions.xml                     |    2 +-
 content/sitemap-incubator.xml                      |   14 +-
 content/sitemap-legacy.xml                         |   14 +-
 content/sitemap-mappings.xml                       |   12 +-
 content/sitemap-pjdo.xml                           |   34 +-
 content/sitemap-pjpa.xml                           |   14 +-
 content/sitemap-refguide.xml                       | 2442 ++++++++++----------
 content/sitemap-relnotes.xml                       |   42 +-
 content/sitemap-security.xml                       |   48 +-
 content/sitemap-setupguide.xml                     |    8 +-
 content/sitemap-subdomains.xml                     |   22 +-
 content/sitemap-testing.xml                        |   36 +-
 content/sitemap-tooling.xml                        |    4 +-
 content/sitemap-userguide.xml                      |  138 +-
 content/sitemap-valuetypes.xml                     |    8 +-
 content/sitemap-vro.xml                            |   40 +-
 content/sitemap-vw.xml                             |   62 +-
 content/subdomains/2.0.0-M5/about.html             |    2 +-
 content/subdomains/2.0.0-M5/base/about.html        |    2 +-
 content/subdomains/2.0.0-M5/docx/about.html        |    2 +-
 content/subdomains/2.0.0-M5/excel/about.html       |    2 +-
 content/subdomains/2.0.0-M5/freemarker/about.html  |    2 +-
 content/subdomains/2.0.0-M5/ognl/about.html        |    2 +-
 content/subdomains/2.0.0-M5/pdfbox/about.html      |    2 +-
 content/subdomains/2.0.0-M5/settings/about.html    |    2 +-
 content/subdomains/2.0.0-M5/spring/about.html      |    2 +-
 content/subdomains/2.0.0-M5/xdocreport/about.html  |    2 +-
 content/subdomains/2.0.0-M5/zip/about.html         |    2 +-
 content/testing/2.0.0-M5/about.html                |    2 +-
 content/testing/2.0.0-M5/fakedata/about.html       |    2 +-
 content/testing/2.0.0-M5/fixtures/about.html       |    2 +-
 .../fixtures/fixture-scripts/api-and-usage.html    |    2 +-
 .../fixture-scripts/mocking-the-clock.html         |    2 +-
 .../fixtures/fixture-scripts/sudo-service.html     |    2 +-
 .../services/ExecutionParametersService.html       |    2 +-
 .../2.0.0-M5/fixtures/services/FixtureScripts.html |    2 +-
 .../FixtureScriptsSpecificationProvider.html       |    2 +-
 content/testing/2.0.0-M5/h2console/about.html      |    2 +-
 .../2.0.0-M5/h2console/services/H2ManagerMenu.html |    2 +-
 content/testing/2.0.0-M5/hsqldbmgr/about.html      |    2 +-
 .../hsqldbmgr/services/HsqlDbManagerMenu.html      |    2 +-
 .../testing/2.0.0-M5/integtestsupport/about.html   |    2 +-
 .../integtestsupport/domain-model-validator.html   |    2 +-
 .../integtestsupport/swagger-exporter.html         |    2 +-
 content/testing/2.0.0-M5/specsupport/about.html    |    2 +-
 .../testing/2.0.0-M5/unittestsupport/about.html    |    2 +-
 content/tooling/2.0.0-M5/about.html                |    2 +-
 content/tooling/2.0.0-M5/tooling-cli/about.html    |    2 +-
 content/userguide/2.0.0-M5/about.html              |    2 +-
 ...ag-419be38423032876d89d1d44c80aafe9db857a3b.svg |   34 +-
 content/userguide/2.0.0-M5/btb/about.html          |    2 +-
 .../userguide/2.0.0-M5/btb/headless-access.html    |    2 +-
 content/userguide/2.0.0-M5/btb/hints-and-tips.html |    2 +-
 .../2.0.0-M5/btb/hints-and-tips/are-you-sure.html  |    2 +-
 .../2.0.0-M5/btb/hints-and-tips/custom-css.html    |    2 +-
 .../how-to-handle-void-and-null-results.html       |    2 +-
 .../how-to-implement-a-spellchecker.html           |    2 +-
 .../btb/hints-and-tips/persisted-title.html        |    2 +-
 .../replacing-default-service-implementations.html |    2 +-
 .../simulating-collections-of-values.html          |    2 +-
 .../subclass-properties-in-tables.html             |    2 +-
 .../hints-and-tips/transactions-and-errors.html    |    2 +-
 .../btb/hints-and-tips/vetoing-visibility.html     |    2 +-
 .../hints-and-tips/view-model-instantiation.html   |    2 +-
 content/userguide/2.0.0-M5/btb/i18n.html           |    2 +-
 .../userguide/2.0.0-M5/btb/other-techniques.html   |    2 +-
 .../userguide/2.0.0-M5/btb/programming-model.html  |    2 +-
 .../btb/programming-model/custom-validator.html    |    2 +-
 .../2.0.0-M5/btb/programming-model/finetuning.html |    2 +-
 content/userguide/2.0.0-M5/command-log/about.html  |    2 +-
 .../userguide/2.0.0-M5/command-replay/about.html   |    2 +-
 content/userguide/2.0.0-M5/flyway/about.html       |    2 +-
 ...ag-1e6be3ab94573991b764958ec88db5a8beb17408.svg |   18 +-
 ...ag-3c9c462c5d1913ae10a71f94738a70175be7f380.svg |   26 +-
 ...ag-873d2b9971dd50f9575ba49032918f5b93d24513.svg |   10 +-
 ...ag-cfcb85c10f3dfa05f6aa809ba4178a22cd3640a0.svg |    6 +-
 ...ag-f34a477a8b176974b1ddfe70a43ebfd1901e7f47.svg |   10 +-
 content/userguide/2.0.0-M5/fun/about.html          |    2 +-
 content/userguide/2.0.0-M5/fun/business-rules.html |    2 +-
 .../2.0.0-M5/fun/business-rules/usability.html     |    2 +-
 .../2.0.0-M5/fun/business-rules/validity.html      |    2 +-
 .../2.0.0-M5/fun/business-rules/visibility.html    |    2 +-
 .../userguide/2.0.0-M5/fun/concepts-patterns.html  |    2 +-
 .../apache-isis-vs-cqrs-and-event-sourcing.html    |    2 +-
 .../fun/concepts-patterns/architecture.html        |    2 +-
 .../fun/concepts-patterns/core-values.html         |    2 +-
 .../fun/concepts-patterns/deployment-options.html  |    2 +-
 .../concepts-patterns/domain-driven-design.html    |    2 +-
 .../2.0.0-M5/fun/concepts-patterns/metamodel.html  |    2 +-
 .../concepts-patterns/naked-objects-pattern.html   |    2 +-
 .../2.0.0-M5/fun/domain-entities-and-services.html |    2 +-
 .../fun/domain-entities-and-services/crud.html     |    2 +-
 .../domain-entities.html                           |    2 +-
 .../domain-services.html                           |    2 +-
 .../inject-services.html                           |    2 +-
 .../2.0.0-M5/fun/drop-downs-and-defaults.html      |    2 +-
 .../userguide/2.0.0-M5/fun/meta-annotations.html   |    2 +-
 content/userguide/2.0.0-M5/fun/mixins.html         |    2 +-
 content/userguide/2.0.0-M5/fun/modules.html        |    2 +-
 content/userguide/2.0.0-M5/fun/object-members.html |    2 +-
 .../2.0.0-M5/fun/object-members/actions.html       |    2 +-
 .../2.0.0-M5/fun/object-members/collections.html   |    2 +-
 .../2.0.0-M5/fun/object-members/properties.html    |    2 +-
 content/userguide/2.0.0-M5/fun/overview.html       |    2 +-
 .../2.0.0-M5/fun/overview/business-rules.html      |    2 +-
 .../userguide/2.0.0-M5/fun/overview/events.html    |    2 +-
 .../2.0.0-M5/fun/overview/identifiers.html         |    2 +-
 .../userguide/2.0.0-M5/fun/overview/modules.html   |    2 +-
 .../2.0.0-M5/fun/overview/object-members.html      |    2 +-
 .../2.0.0-M5/fun/overview/programming-model.html   |    2 +-
 .../fun/overview/types-of-domain-objects.html      |    2 +-
 .../userguide/2.0.0-M5/fun/programming-model.html  |    2 +-
 content/userguide/2.0.0-M5/fun/ui.html             |    2 +-
 .../2.0.0-M5/fun/ui/action-icons-and-css.html      |    2 +-
 .../userguide/2.0.0-M5/fun/ui/menubars-layout.html |    2 +-
 .../2.0.0-M5/fun/ui/names-and-descriptions.html    |    2 +-
 .../userguide/2.0.0-M5/fun/ui/object-layout.html   |    2 +-
 .../2.0.0-M5/fun/ui/object-titles-and-icons.html   |    2 +-
 .../userguide/2.0.0-M5/fun/ui/table-columns.html   |    2 +-
 content/userguide/2.0.0-M5/fun/view-models.html    |    2 +-
 .../2.0.0-M5/fun/view-models/UNUSED-dto.html       |    2 +-
 .../userguide/2.0.0-M5/model-annotation/about.html |    5 +-
 content/userguide/2.0.0-M5/quartz/about.html       |    2 +-
 content/valuetypes/2.0.0-M5/about.html             |    2 +-
 content/valuetypes/2.0.0-M5/asciidoc/about.html    |    2 +-
 content/valuetypes/2.0.0-M5/markdown/about.html    |    2 +-
 content/valuetypes/2.0.0-M5/sse/about.html         |    2 +-
 ...ag-f9a8cc2b499edea24153162102fc036f9d270382.svg |   26 +-
 content/vro/2.0.0-M5/about.html                    |    2 +-
 content/vro/2.0.0-M5/content-negotiation.html      |    2 +-
 .../apache-isis-v2-profile.INCOMPLETE.html         |    2 +-
 .../apache-isis-v2-profile.html                    |    2 +-
 .../content-negotiation/other-representations.html |    2 +-
 .../simplified-representations/accept-header.html  |    2 +-
 .../action-invocation.html                         |    2 +-
 .../configuration-properties.html                  |    2 +-
 .../simplified-representations/domain-object.html  |    2 +-
 .../object-collection.html                         |    2 +-
 content/vro/2.0.0-M5/cors/about.html               |    2 +-
 content/vro/2.0.0-M5/hints-and-tips.html           |    2 +-
 .../2.0.0-M5/hints-and-tips/pretty-printing.html   |    2 +-
 .../hints-and-tips/restful-image-property.html     |    2 +-
 .../2.0.0-M5/hints-and-tips/troubleshooting.html   |    2 +-
 .../hints-and-tips/view-model-as-parameter.html    |    2 +-
 content/vro/2.0.0-M5/layout-resources.html         |    2 +-
 content/vro/2.0.0-M5/ro-spec.html                  |    2 +-
 content/vro/2.0.0-M5/security.html                 |    2 +-
 content/vro/2.0.0-M5/setup-and-configuration.html  |    2 +-
 ...ag-c4ec2b950533a4717f3df81e1592762cfc3e6e17.svg |   14 +-
 content/vw/2.0.0-M5/about.html                     |    2 +-
 content/vw/2.0.0-M5/customisation.html             |    2 +-
 content/vw/2.0.0-M5/customisation/about-page.html  |    2 +-
 content/vw/2.0.0-M5/customisation/brand-logo.html  |    2 +-
 .../customisation/cheap-n-cheerful-theme.html      |    2 +-
 content/vw/2.0.0-M5/customisation/custom-css.html  |    2 +-
 .../2.0.0-M5/customisation/custom-javascript.html  |    2 +-
 .../vw/2.0.0-M5/customisation/embedded-view.html   |    2 +-
 .../customisation/top-level-index-page.html        |    2 +-
 .../vw/2.0.0-M5/customisation/welcome-page.html    |    2 +-
 content/vw/2.0.0-M5/exceldownload/about.html       |    2 +-
 content/vw/2.0.0-M5/extending.html                 |    2 +-
 .../2.0.0-M5/extending/custom-bootstrap-theme.html |    2 +-
 content/vw/2.0.0-M5/extending/custom-pages.html    |    2 +-
 .../extending/replacing-page-elements.html         |    2 +-
 content/vw/2.0.0-M5/features.html                  |    2 +-
 content/vw/2.0.0-M5/features/bookmarked-pages.html |    2 +-
 .../features/sidebar-vs-modal-dialogs.html         |    2 +-
 content/vw/2.0.0-M5/features/titles-in-tables.html |    2 +-
 .../vw/2.0.0-M5/features/user-registration.html    |    2 +-
 content/vw/2.0.0-M5/features/where-am-i.html       |    2 +-
 content/vw/2.0.0-M5/fullcalendar/about.html        |    2 +-
 content/vw/2.0.0-M5/gmap3/about.html               |    2 +-
 content/vw/2.0.0-M5/hints-and-tips.html            |    2 +-
 .../vw/2.0.0-M5/hints-and-tips/auto-refresh.html   |    2 +-
 .../i18n-label-in-wicket-viewer.html               |    2 +-
 .../2.0.0-M5/hints-and-tips/per-user-themes.html   |    2 +-
 .../vw/2.0.0-M5/hints-and-tips/svg-support.html    |    2 +-
 content/vw/2.0.0-M5/pdfjs/about.html               |    2 +-
 content/vw/2.0.0-M5/security.html                  |    2 +-
 content/vw/2.0.0-M5/setup-and-configuration.html   |    2 +-
 update-search-index.sh                             |    2 +
 1629 files changed, 5879 insertions(+), 7637 deletions(-)

diff --git a/content/404.html b/content/404.html
index c728a85..ef6f9f5 100644
--- a/content/404.html
+++ b/content/404.html
@@ -359,7 +359,7 @@ If you typed the URL of this page manually, please double check that you entered
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/about.html b/content/comguide/2.0.0-M5/about.html
index 18ae11a..cd95c02 100644
--- a/content/comguide/2.0.0-M5/about.html
+++ b/content/comguide/2.0.0-M5/about.html
@@ -436,7 +436,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/algolia-search.html b/content/comguide/2.0.0-M5/algolia-search.html
index ef93b51..1012a11 100644
--- a/content/comguide/2.0.0-M5/algolia-search.html
+++ b/content/comguide/2.0.0-M5/algolia-search.html
@@ -641,7 +641,7 @@ There are other options for styling, see <a href="https://docsearch.algolia.com/
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/antora-publish-procedure.html b/content/comguide/2.0.0-M5/antora-publish-procedure.html
index 002b7af..a9328be 100644
--- a/content/comguide/2.0.0-M5/antora-publish-procedure.html
+++ b/content/comguide/2.0.0-M5/antora-publish-procedure.html
@@ -729,7 +729,7 @@ git push</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/applying-patches.html b/content/comguide/2.0.0-M5/applying-patches.html
index 81eed64..2c91315 100644
--- a/content/comguide/2.0.0-M5/applying-patches.html
+++ b/content/comguide/2.0.0-M5/applying-patches.html
@@ -540,7 +540,7 @@ git commit -am "&lt;original authors' commit message&gt;" --signoff</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/cutting-a-release.html b/content/comguide/2.0.0-M5/cutting-a-release.html
index 2c2f976..3483bc1 100644
--- a/content/comguide/2.0.0-M5/cutting-a-release.html
+++ b/content/comguide/2.0.0-M5/cutting-a-release.html
@@ -1477,7 +1477,7 @@ The vote will be open for a minimum of 72 hours.
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/key-generation.html b/content/comguide/2.0.0-M5/key-generation.html
index a5536d2..f715aa0 100644
--- a/content/comguide/2.0.0-M5/key-generation.html
+++ b/content/comguide/2.0.0-M5/key-generation.html
@@ -1157,7 +1157,7 @@ This is defined under a profile so that it is activated only when we perform a r
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/merging-a-pull-request.html b/content/comguide/2.0.0-M5/merging-a-pull-request.html
index 0ef15d1..ce57a8c 100644
--- a/content/comguide/2.0.0-M5/merging-a-pull-request.html
+++ b/content/comguide/2.0.0-M5/merging-a-pull-request.html
@@ -622,7 +622,7 @@ This is intentional: when the merged branch is pushed, github will automatically
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/pmc-notes.html b/content/comguide/2.0.0-M5/pmc-notes.html
index b00c498..f242700 100644
--- a/content/comguide/2.0.0-M5/pmc-notes.html
+++ b/content/comguide/2.0.0-M5/pmc-notes.html
@@ -846,7 +846,7 @@ modify_committee.pl isis --remove joebloggs</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/policies.html b/content/comguide/2.0.0-M5/policies.html
index 9b21956..6b2dd83 100644
--- a/content/comguide/2.0.0-M5/policies.html
+++ b/content/comguide/2.0.0-M5/policies.html
@@ -612,7 +612,7 @@ git push origin --delete ISIS-999</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/policies/git-policy.html b/content/comguide/2.0.0-M5/policies/git-policy.html
index 6cb4395..1b38bab 100644
--- a/content/comguide/2.0.0-M5/policies/git-policy.html
+++ b/content/comguide/2.0.0-M5/policies/git-policy.html
@@ -561,7 +561,7 @@ git push origin --delete ISIS-999</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/policies/versioning-policy.html b/content/comguide/2.0.0-M5/policies/versioning-policy.html
index c0fdccb..a6e8543 100644
--- a/content/comguide/2.0.0-M5/policies/versioning-policy.html
+++ b/content/comguide/2.0.0-M5/policies/versioning-policy.html
@@ -476,7 +476,7 @@ This will help avoid "jar hell" (components having conflicting dependencies of c
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/post-release-successful.html b/content/comguide/2.0.0-M5/post-release-successful.html
index d80a61b..b21866c 100644
--- a/content/comguide/2.0.0-M5/post-release-successful.html
+++ b/content/comguide/2.0.0-M5/post-release-successful.html
@@ -1299,7 +1299,7 @@ Copy-n-paste the above mailing list announcement should suffice.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/post-release-unsuccessful.html b/content/comguide/2.0.0-M5/post-release-unsuccessful.html
index 8e2d40f..530f536 100644
--- a/content/comguide/2.0.0-M5/post-release-unsuccessful.html
+++ b/content/comguide/2.0.0-M5/post-release-unsuccessful.html
@@ -574,7 +574,7 @@ These steps:</td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/release-process-prereqs.html b/content/comguide/2.0.0-M5/release-process-prereqs.html
index e316511..c5e49c2 100644
--- a/content/comguide/2.0.0-M5/release-process-prereqs.html
+++ b/content/comguide/2.0.0-M5/release-process-prereqs.html
@@ -551,7 +551,7 @@ A description of how to do this can be found, for example, <a href="http://bval.
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/updating-the-website.html b/content/comguide/2.0.0-M5/updating-the-website.html
index dda16a8..cadf228 100644
--- a/content/comguide/2.0.0-M5/updating-the-website.html
+++ b/content/comguide/2.0.0-M5/updating-the-website.html
@@ -611,7 +611,7 @@ Additional config options for the crawler can be found <a href="https://www.algo
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/2.0.0-M5/verifying-releases.html b/content/comguide/2.0.0-M5/verifying-releases.html
index e7132b5..44bc708 100644
--- a/content/comguide/2.0.0-M5/verifying-releases.html
+++ b/content/comguide/2.0.0-M5/verifying-releases.html
@@ -676,7 +676,7 @@ Things to check include:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/about.html b/content/conguide/2.0.0-M5/about.html
index fafe06d..b672055 100644
--- a/content/conguide/2.0.0-M5/about.html
+++ b/content/conguide/2.0.0-M5/about.html
@@ -422,7 +422,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/agilej/about.html b/content/conguide/2.0.0-M5/agilej/about.html
index abbdbd8..4bb211d 100644
--- a/content/conguide/2.0.0-M5/agilej/about.html
+++ b/content/conguide/2.0.0-M5/agilej/about.html
@@ -478,7 +478,7 @@ hide method lines</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/building-apache-isis.html b/content/conguide/2.0.0-M5/building-apache-isis.html
index 048578c..3a055d6 100644
--- a/content/conguide/2.0.0-M5/building-apache-isis.html
+++ b/content/conguide/2.0.0-M5/building-apache-isis.html
@@ -884,7 +884,7 @@ This is in preparation for Java 9 module system (Jigsaw) which will prevent such
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/contributing.html b/content/conguide/2.0.0-M5/contributing.html
index 0f1cc09..1cc24df 100644
--- a/content/conguide/2.0.0-M5/contributing.html
+++ b/content/conguide/2.0.0-M5/contributing.html
@@ -786,7 +786,7 @@ If so, use:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/documentation/_images/diag-0a5124db4e5a007b09600f789391b49921470e5b.png b/content/conguide/2.0.0-M5/documentation/_images/diag-0a5124db4e5a007b09600f789391b49921470e5b.png
index 3048fd8..d07958f 100644
Binary files a/content/conguide/2.0.0-M5/documentation/_images/diag-0a5124db4e5a007b09600f789391b49921470e5b.png and b/content/conguide/2.0.0-M5/documentation/_images/diag-0a5124db4e5a007b09600f789391b49921470e5b.png differ
diff --git a/content/conguide/2.0.0-M5/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg b/content/conguide/2.0.0-M5/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg
index e0d54eb..57d71b1 100644
--- a/content/conguide/2.0.0-M5/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg
+++ b/content/conguide/2.0.0-M5/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg
@@ -1,22 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="583px" preserveAspectRatio="none" style="width:513px;height:583px;" version="1.1" viewBox="0 0 513 583" width="513px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="420" x="40" y="18.9492">System  [...]
-entity customer--><rect fill="#08427B" height="162.4727" style="stroke:#073B6F;stroke-width:1.5;" width="204" x="166" y="31.293"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="246" y="53.9258">«person»</text><image height="48" width="48" x="244" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAACD0lEQVR4Xu2YoU4EMRCGT+4j8Ai8AhaH4QHgAUjQuFMECUgMIUgwJAgMhgQsAYUiJCiQIBBY+EITsjfTdme6V24 [...]
-entity banking_system--><rect fill="#1168BD" height="114.4727" style="stroke:#3C7FC0;stroke-width:1.5;" width="218" x="7" y="271.293"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="47" x="92.5" y="293.9258">«system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="29" y="314.332">Internet Banking System</text><text fill="#FFFFFF" font-famil [...]
-entity mail_system--><rect fill="#999999" height="114.4727" style="stroke:#8A8A8A;stroke-width:1.5;" width="172" x="335" y="271.293"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="93" x="374.5" y="293.9258">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="99" x="371.5" y="314.332">E-mail system</text><text fill="#FFFFFF" font-fami [...]
-entity mainframe--><rect fill="#999999" height="114.4727" style="stroke:#8A8A8A;stroke-width:1.5;" width="215" x="8.5" y="463.293"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="93" x="69.5" y="485.9258">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="18.5" y="506.332">Mainframe Banking System</text><text fill="#FFFFFF" f [...]
-link customer to banking_system--><path d="M210.97,193.583 C194.33,217.023 176.39,242.273 160.63,264.463 " fill="none" id="customer-to-banking_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="155.81,271.243,162.8912,266.4621,158.0016,262.9848,155.81,271.243" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="26" x="189" y="236.9258">Uses</text><!--MD5 [...]
-reverse link customer to mail_system--><path d="M330.2,200.303 C347.32,224.233 365.42,249.563 380.92,271.243 " fill="none" id="customer-backto-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="325.41,193.583,327.6221,201.8356,332.5031,198.3462,325.41,193.583" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="87" x="359" y="236.9258">Sends e-mails [...]
-link banking_system to mail_system--><path d="M225.25,328.293 C258.5,328.293 294.74,328.293 326.9,328.293 " fill="none" id="banking_system-to-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="334.98,328.293,326.98,325.293,326.98,331.293,334.98,328.293" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="73" x="243.5" y="304.9258">Sends e-mails</tex [...]
-link banking_system to mainframe--><path d="M116,385.533 C116,407.363 116,432.483 116,455.023 " fill="none" id="banking_system-to-mainframe" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="116,463.203,119,455.203,113,455.203,116,463.203" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="26" x="117" y="428.9258">Uses</text><!--MD5=[e8176b74b26fe17eb4222b853e4b76d8]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="565px" preserveAspectRatio="none" style="width:525px;height:565px;" version="1.1" viewBox="0 0 525 565" width="525px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="424" x="44" y="17.9999">System  [...]
+entity customer--><rect fill="#08427B" height="151.9999" style="stroke:#073B6F;stroke-width:1.5;" width="203" x="172.5" y="28.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="47" x="250.5" y="50.5999">«person»</text><image height="48" width="48" x="250" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAACD0lEQVR4Xu2YoU4EMRCGT+4j8Ai8AhaH4QHgAUjQuFMECUgMIUgwJAgMhgQsAYUiJCiQIBBY+EITsjfTdm [...]
+entity banking_system--><rect fill="#1168BD" height="103.9999" style="stroke:#3C7FC0;stroke-width:1.5;" width="220" x="7" y="256.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="93" y="278.5999">«system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="23.5" y="297">Internet Banking System</text><text fill="#FFFFFF" font-family=" [...]
+entity mail_system--><rect fill="#999999" height="103.9999" style="stroke:#8A8A8A;stroke-width:1.5;" width="174" x="345" y="256.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="383" y="278.5999">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="106" x="379" y="297">E-mail system</text><text fill="#FFFFFF" font-family="sa [...]
+entity mainframe--><rect fill="#999999" height="123.2" style="stroke:#8A8A8A;stroke-width:1.5;" width="207" x="13.5" y="436.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="68" y="458.5999">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="147" x="41.5" y="477">Mainframe Banking</text><text fill="#FFFFFF" font-family="sa [...]
+link customer to banking_system--><path d="M215.54,180.8199 C197.76,203.6899 178.52,228.4499 161.79,249.9699 " fill="none" id="customer-to-banking_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="156.68,256.5399,163.9547,252.0589,159.2145,248.3804,156.68,256.5399" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="30" x="192" y="223.5999">Uses</text>< [...]
+reverse link customer to mail_system--><path d="M337.96,187.3699 C356.25,210.7599 375.66,235.5699 392.06,256.5399 " fill="none" id="customer-backto-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="332.83,180.8199,335.3965,188.9693,340.1222,185.2723,332.83,180.8199" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="95" x="368" y="223.5999">Sends  [...]
+link banking_system to mail_system--><path d="M227.17,308.5999 C262.9,308.5999 302.2,308.5999 336.75,308.5999 " fill="none" id="banking_system-to-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="344.96,308.5999,336.96,305.5999,336.96,311.5999,344.96,308.5999" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="81" x="245.5" y="288.5999">Sends e-ma [...]
+link banking_system to mainframe--><path d="M117,360.8399 C117,381.5999 117,405.8899 117,428.1699 " fill="none" id="banking_system-to-mainframe" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="117,436.2699,120,428.2699,114,428.2699,117,436.2699" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="30" x="118" y="403.5999">Uses</text><!--MD5=[63aa0b84d3744654f2 [...]
 @startuml
-' C4-PlantUML, version 2.0.0
-' https://github.com/plantuml-stdlib/C4-PlantUML
+' C4-PlantUML
+' https://github.com/plantuml-stdlib/C4-PlantUML/tree/v2.1.0
 
 ' Colors
 ' ##################################
 
 !global $ELEMENT_FONT_COLOR = "#FFFFFF"
+
+!global $ARROW_COLOR = "#666666"
+
+!global $BOUNDARY_COLOR = "#444444"
+!global $BOUNDARY_BG_COLOR = "#FFFFFF"
+
 !global $LEGEND_FONT_COLOR = "#FFFFFF"
 !global $LEGEND_TITLE_COLOR = "#000000"
+!global $LEGEND_UNDEFINED_BK_COLOR = "#87AECA"
+!global $LEGEND_UNDEFINED_FONT_COLOR = "#B7DEFA"
 
 ' Styling
 ' ##################################
@@ -48,19 +56,244 @@ skinparam queue {
 }
 
 skinparam Arrow {
-    Color #666666
-    FontColor #666666
+    Color $ARROW_COLOR
+    FontColor $ARROW_COLOR
     FontSize 12
 }
 
+' Some boundary skinparam have to be set a package skinparams too (PlantUML uses internal packages)
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontStyle plain
+    BackgroundColor $BOUNDARY_BG_COLOR
+}
+
 skinparam rectangle<<boundary>> {
     Shadowing false
-    StereotypeFontSize 0
-    FontColor #444444
-    BorderColor #444444
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontColor $BOUNDARY_COLOR
+    BorderColor $BOUNDARY_COLOR
+    BackgroundColor $BOUNDARY_BG_COLOR
     BorderStyle dashed
 }
 
+' Legend and Tags
+' ##################################
+!global $tagDefaultLegend = ""
+!global $tagCustomLegend = ""
+
+!unquoted function $toStereos($elementType, $tags)
+  !if (%strlen($tags) == 0)
+    !$stereos = '<<' + $elementType + '>>'
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !return $stereos
+  !endif
+  !$stereos = ''
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+%set_variable_value("$" + $tag + "Legend", %true())
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags)>0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+%set_variable_value("$" + $tags + "Legend", %true())
+  !endif
+  ' has to be last, otherwise PlantUML overwrites all tag specific skinparams
+  !$stereos = $stereos + '<<' + $elementType + '>>'
+%set_variable_value("$" + $elementType + "Legend", %true())
+  !return $stereos
+!endfunction
+
+!function $elementTagSkinparams($element, $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !$elementSkin = "skinparam " + $element +"<<" + $tagStereo + ">> {" + %newline()
+  !if ($fontColor!="")
+    !if ($tagStereo != "boundary")
+      !$elementSkin = $elementSkin + "    StereotypeFontColor " + $fontColor + %newline()
+    !endif
+    !$elementSkin = $elementSkin + "    FontColor " + $fontColor + %newline()
+  !endif
+  !if ($bgColor!="")
+    !$elementSkin = $elementSkin + "    BackgroundColor " + $bgColor + %newline()
+  !endif
+  !if ($borderColor!="")
+    !$elementSkin = $elementSkin + "    BorderColor " + $borderColor+ %newline()
+  !endif
+  !if ($shadowing == "true")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "true" + %newline()
+  !endif
+  !if ($shadowing == "false")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "false" + %newline()
+  !endif
+  !$elementSkin = $elementSkin + "}" + %newline()
+  !return $elementSkin
+!endfunction
+
+!unquoted procedure $defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !if ($tagStereo == "boundary" && $bgColor!="")
+    !$tagSkin = $tagSkin + "skinparam package<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+    !$tagSkin = $tagSkin + "skinparam rectangle<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+  !endif
+$tagSkin
+!endprocedure
+
+!function $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !$tagEntry = "|"
+  !if ($bgColor!="")
+    !$bg = $bgColor
+  !else
+    !$bg = $LEGEND_UNDEFINED_BK_COLOR
+  !endif
+  ' named colors have to start with # too
+  !if (%substr($bg, 0, 1) != "#")
+    !$bg = "#" + $bg
+  !endif
+  !$tagEntry = $tagEntry + "<" + $bg +">"
+  ' <U+25AF> ..white rectangle
+  !if ($borderColor!="")
+    !$tagEntry = $tagEntry + "<color:"+$borderColor+"> <U+25AF></color> "
+  !else
+    !$tagEntry = $tagEntry + "<color:"+$bg+"> <U+25AF></color> "
+  !endif
+  !if ($fontColor!="")
+    !$tagEntry = $tagEntry + "<color:"+$fontColor+">"
+  !else
+    !$tagEntry = $tagEntry + "<color:"+$LEGEND_UNDEFINED_FONT_COLOR+">"
+  !endif
+  !$tagEntry = $tagEntry + " " + $tagStereo + " "
+  !if ($shadowing == "true")
+    !$tagEntry = $tagEntry + "(shadow) "
+  !endif
+  !if ($shadowing == "false")
+    !$tagEntry = $tagEntry + "(no shadow) "
+  !endif
+  !if ($fontColor == "" && $bgColor == "")
+      !$tagEntry = $tagEntry + "(no font, no back color) "
+  !else
+    !if ($fontColor == "")
+      !$tagEntry = $tagEntry + "(no font color) "
+    !endif
+    !if ($bgColor == "")
+      !$tagEntry = $tagEntry + "(no back color) "
+    !endif
+  !endif
+  !$tagEntry = $tagEntry + "</color> "
+  !$tagEntry = $tagEntry + "|"
+  !return $tagEntry
+!endfunction
+
+!unquoted procedure $addTagToDynamicLegend($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
+  !$tagEntry = $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+%set_variable_value("$" + $tagStereo + "LegendEntry", $tagEntry)
+  !$tagCustomLegend = $tagCustomLegend + $tagStereo + "\n"
+!endprocedure
+
+!procedure $showActiveLegendEntries($allDefined)
+  !$brPos = %strpos($allDefined, "\n")
+  !while ($brPos >= 0)
+    !$tagStereo = %substr($allDefined, 0, $brPos)
+    !$allDefined = %substr($allDefined, $brPos+2)
+    !$brPos = %strpos($allDefined, "\n")
+    !if (%variable_exists("$" + $tagStereo + "Legend"))
+%get_variable_value("$" + $tagStereo + "LegendEntry")
+    !endif
+  !endwhile
+  !if (%strlen($allDefined)>0)
+    !$tagStereo = $allDefined
+    !if (%variable_exists("$" + $tagStereo + "Legend"))
+%get_variable_value("$" + $tagStereo + "LegendEntry")
+    !endif
+  !endif
+!endprocedure
+
+' used by new defined tags
+!unquoted procedure AddTagSupport($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
+$defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+$addTagToDynamicLegend($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+!endprocedure
+
+' used by existing elements like person, ...
+!unquoted procedure UpdateSkinparamsAndLegendEntry($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
+$defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+  !$tagEntry = $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
+%set_variable_value("$" + $tagStereo + "LegendEntry", $tagEntry)
+!endprocedure
+
+' tags/stereotypes have to be delimited with \n
+!unquoted procedure SetDefaultLegendEntries($tagStereoEntries)
+  !$tagDefaultLegend = $tagStereoEntries
+!endprocedure
+
+' Element properties
+' ##################################
+
+' collect all defined properties as table rows
+!global $propTable = ""
+!global $propTableCaption = ""
+!global $propColCaption = "="
+
+!unquoted function SetPropertyHeader($col1Name, $col2Name, $col3Name = "", $col4Name = "")
+  !$propColCaption = ""
+  !$propTableCaption = "|= " + $col1Name + " |= " + $col2Name + " |"
+  !if ($col3Name != "")
+    !$propTableCaption = $propTableCaption + "= " + $col3Name + " |"
+  !endif
+  !if ($col4Name != "")
+    !$propTableCaption = $propTableCaption + "= " + $col4Name + " |"
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function WithoutPropertyHeader()
+  !$propTableCaption = ""
+  !$propColCaption = "="
+  !return ""
+!endfunction
+
+!unquoted function AddProperty($col1, $col2, $col3 = "", $col4 = "")
+  !if ($propTable == "")
+    !if ($propTableCaption != "")
+      !$propTable = $propTableCaption + "\n"
+    !endif
+  !else
+    !$propTable = $propTable + "\n"
+  !endif
+  !$propTable = $propTable + "| " + $col1 + " |" + $propColCaption + " " + $col2 + " |"
+  !if ($col3 != "")
+    !$propTable = $propTable + " " + $col3 + " |"
+  !endif
+  !if ($col4 != "")
+    !$propTable = $propTable + " " + $col4 + " |"
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function $getProps($alignedNL = "\n")
+  !if ($propTable != "")
+    !$retTable = $alignedNL + $propTable
+    !$propTable = ""
+    !return $retTable
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function $getProps_L()
+  !return $getProps("\l")
+!endfunction
+
+!unquoted function $getProps_R()
+  !return $getProps("\r")
+!endfunction
+
+SetPropertyHeader("Property","Value")
+
 ' Layout
 ' ##################################
 
@@ -79,27 +312,45 @@ center footer <font color=red>Warning:</font> Created for discussion, needs to b
 top to bottom direction
 !endprocedure
 
-!procedure LAYOUT_LEFT_RIGHT() 
+!procedure LAYOUT_LEFT_RIGHT()
 left to right direction
 !endprocedure
 
+' has to be last call in diagram
+!unquoted procedure SHOW_DYNAMIC_LEGEND($hideStereotype="true")
+!if ($hideStereotype=="true")
+hide stereotype
+!endif
+legend right
+|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
+$showActiveLegendEntries($tagDefaultLegend)
+$showActiveLegendEntries($tagCustomLegend)
+endlegend
+!endprocedure
+
 ' Boundaries
 ' ##################################
 
-!unquoted function Boundary($alias, $label)
-!return 'rectangle "=='+$label+'" <<boundary>> as '+$alias
-!endfunction
-!unquoted function Boundary($alias, $label, $type)
-!return 'rectangle "=='+$label+'\n<size:'+$TECHN_FONT_SIZE+'>['+$type+']</size>" <<boundary>> as '+$alias
+!function $getBoundary($label, $type)
+  !if ($type == "")
+    !return '==' + $label
+  !endif
+  !if (type != "")
+    !return '==' + $label + '\n<size:' + $TECHN_FONT_SIZE + '>[' + $type + ']</size>'
+  !endif
 !endfunction
 
+!unquoted procedure Boundary($alias, $label, $type="", $tags="")
+rectangle "$getBoundary($label, $type)" $toStereos("boundary", $tags) as $alias
+!endprocedure
+
 ' Relationship
 ' ##################################
 
-!unquoted procedure Rel_($alias1, $alias2, $label, $direction="")
+!unquoted procedure Rel_($alias1, $alias2, $label, $direction)
 $alias1 $direction $alias2 : **$label**
 !endprocedure
-!unquoted procedure Rel_($alias1, $alias2, $label, $techn, $direction="")
+!unquoted procedure Rel_($alias1, $alias2, $label, $techn, $direction)
 $alias1 $direction $alias2 : **$label**\n//<size:$TECHN_FONT_SIZE>[$techn]</size>//
 !endprocedure
 
@@ -256,7 +507,13 @@ $from -[hidden]R- $to
 !endprocedure
 !unquoted procedure Lay_L($from, $to)
 $from -[hidden]L- $to
-!endprocedure
+!endprocedure' convert it with additional command line argument -DRELATIVE_INCLUDE="." to use locally
+!if %variable_exists("RELATIVE_INCLUDE")
+  !include %get_variable_value("RELATIVE_INCLUDE")/C4.puml
+!else
+  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4.puml
+!endif
+
 ' Scope: A single software system.
 ' Primary elements: The software system in scope.
 ' Supporting elements: People and software systems directly connected to the software system in scope.
@@ -266,40 +523,25 @@ $from -[hidden]L- $to
 ' ##################################
 
 !global $PERSON_BG_COLOR = "#08427B"
+!global $PERSON_BORDER_COLOR = "#073B6F"
 !global $EXTERNAL_PERSON_BG_COLOR = "#686868"
+!global $EXTERNAL_PERSON_BORDER_COLOR = "#8A8A8A"
 !global $SYSTEM_BG_COLOR = "#1168BD"
+!global $SYSTEM_BORDER_COLOR = "#3C7FC0"
 !global $EXTERNAL_SYSTEM_BG_COLOR = "#999999"
+!global $EXTERNAL_SYSTEM_BORDER_COLOR = "#8A8A8A"
 
 ' Styling
 ' ##################################
 
-skinparam rectangle<<person>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $PERSON_BG_COLOR
-    BorderColor #073B6F
-}
-
-skinparam rectangle<<external_person>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_PERSON_BG_COLOR
-    BorderColor #8A8A8A
-}
+UpdateSkinparamsAndLegendEntry("person", $PERSON_BG_COLOR, $ELEMENT_FONT_COLOR, $PERSON_BORDER_COLOR)
+UpdateSkinparamsAndLegendEntry("external_person", $EXTERNAL_PERSON_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_PERSON_BORDER_COLOR)
+UpdateSkinparamsAndLegendEntry("system", $SYSTEM_BG_COLOR, $ELEMENT_FONT_COLOR, $SYSTEM_BORDER_COLOR)
+UpdateSkinparamsAndLegendEntry("external_system", $EXTERNAL_SYSTEM_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_SYSTEM_BORDER_COLOR)
 
-skinparam rectangle<<system>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $SYSTEM_BG_COLOR
-    BorderColor #3C7FC0
-}
 
-skinparam rectangle<<external_system>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_SYSTEM_BG_COLOR
-    BorderColor #8A8A8A
-}
+' Sprites
+' ##################################
 
 sprite $person [48x48/16] {
 000000000000000000000000000000000000000000000000
@@ -352,9 +594,62 @@ sprite $person [48x48/16] {
 000000000000000000000000000000000000000000000000
 }
 
+sprite $person2 [48x48/16] {
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000002578888300000000005888864100000000000
+0000000007DFFFFFFFFD9643347BFFFFFFFFFB4000000000
+00000004EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB10000000
+0000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD2000000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+00003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+0000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF50000
+0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0000
+0009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+0009FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFF2000
+0003FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFD0000
+0000BFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFF50000
+00003FFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFB00000
+000006FFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFE100000
+0000007FFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFD2000000
+00000004EFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFB10000000
+0000000007DF8FFFFFFFFFFFFFFFFFFFFFF8FB4000000000
+000000000002578888888888888888888864100000000000
+}
+
 ' Layout
 ' ##################################
 
+SetDefaultLegendEntries("person\nsystem\nexternal_person\nexternal_system")
+
 !procedure LAYOUT_WITH_LEGEND()
 hide stereotype
 legend right
@@ -366,21 +661,38 @@ legend right
 endlegend
 !endprocedure
 
+!global $defaultPersonSprite = "person"
+
+!procedure HIDE_PERSON_SPRITE()
+  !$defaultPersonSprite = ""
+!endprocedure
+
+!unquoted procedure SHOW_PERSON_SPRITE($sprite="")
+  !if ($sprite == "")
+    !$defaultPersonSprite = "person"
+  !else
+    !$defaultPersonSprite = $sprite
+  !endif
+!endprocedure
+
 ' Elements
 ' ##################################
 
 !function $getPerson($label, $descr, $sprite)
+!if ($sprite == "") && ($defaultPersonSprite!="")
+  !$sprite = $defaultPersonSprite
+!endif
 !if ($descr == "") && ($sprite == "")
-!return '<$person>\n=='+$label
+  !return '=='+$label
 !endif
 !if ($descr == "") && ($sprite != "")
-!return '<$'+$sprite+'>\n=='+$label
+  !return '<$'+$sprite+'>\n=='+$label
 !endif
 !if ($descr != "") && ($sprite == "")
-!return '<$person>\n=='+$label+'\n\n '+$descr
+  !return '=='+$label+'\n\n '+$descr
 !endif
 !if ($descr != "") && ($sprite != "")
-!return '<$'+$sprite+'>\n=='+$label+'\n\n '+$descr
+  !return '<$'+$sprite+'>\n=='+$label+'\n\n '+$descr
 !endif
 !endfunction
 
@@ -399,31 +711,53 @@ endlegend
 !endif
 !endfunction
 
-!unquoted procedure Person($alias, $label, $descr="", $sprite="")
-rectangle "$getPerson($label, $descr, $sprite)" <<person>> as $alias
+!unquoted procedure Person($alias, $label, $descr="", $sprite="", $tags="")
+rectangle "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("person", $tags) as $alias
+!endprocedure
+
+!unquoted procedure Person_Ext($alias, $label, $descr="", $sprite="", $tags="")
+rectangle "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("external_person", $tags) as $alias
 !endprocedure
 
-!unquoted procedure Person_Ext($alias, $label, $descr="", $sprite="")
-rectangle "$getPerson($label, $descr, $sprite)" <<external_person>> as $alias
+!unquoted procedure System($alias, $label, $descr="", $sprite="", $tags="")
+rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
 !endprocedure
 
-!unquoted procedure System($alias, $label, $descr="", $sprite="")
-rectangle "$getSystem($label, $descr, $sprite)" <<system>> as $alias
+!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="")
+rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
 !endprocedure
 
-!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="")
-rectangle "$getSystem($label, $descr, $sprite)" <<external_system>> as $alias
+!unquoted procedure SystemDb($alias, $label, $descr="", $sprite="", $tags="")
+database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
+!endprocedure
+
+!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
+!endprocedure
+
+!unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="")
+database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
+!endprocedure
+
+!unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
 !endprocedure
 
 ' Boundaries
 ' ##################################
 
-!unquoted function Enterprise_Boundary($alias, $label)
-!return Boundary($alias, $label, "Enterprise")
-!endfunction
-!unquoted function System_Boundary($alias, $label)
-!return Boundary($alias, $label, "System")
-!endfunction
+!unquoted procedure Enterprise_Boundary($alias, $label, $tags="")
+Boundary($alias, $label, "Enterprise", $tags)
+!endprocedure
+!unquoted procedure System_Boundary($alias, $label, $tags="")
+Boundary($alias, $label, "System", $tags)
+!endprocedure' convert it with additional command line argument -DRELATIVE_INCLUDE="." to use locally
+!if %variable_exists("RELATIVE_INCLUDE")
+  !include %get_variable_value("RELATIVE_INCLUDE")/C4_Context.puml
+!else
+  !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+!endif
+
 ' Scope: A single software system.
 ' Primary elements: Containers within the software system in scope.
 ' Supporting elements: People and software systems directly connected to the containers.
@@ -439,52 +773,14 @@ rectangle "$getSystem($label, $descr, $sprite)" <<external_system>> as $alias
 
 ' Styling
 ' ##################################
-
-skinparam rectangle<<container>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $CONTAINER_BG_COLOR
-    BorderColor $CONTAINER_BORDER_COLOR
-}
-
-skinparam database<<container>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $CONTAINER_BG_COLOR
-    BorderColor $CONTAINER_BORDER_COLOR
-}
-
-skinparam queue<<container>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $CONTAINER_BG_COLOR
-    BorderColor $CONTAINER_BORDER_COLOR
-}
-
-skinparam rectangle<<external_container>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_CONTAINER_BG_COLOR
-    BorderColor $EXTERNAL_CONTAINER_BORDER_COLOR
-}
-
-skinparam database<<external_container>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_CONTAINER_BG_COLOR
-    BorderColor $EXTERNAL_CONTAINER_BORDER_COLOR
-}
-
-skinparam queue<<external_container>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_CONTAINER_BG_COLOR
-    BorderColor $EXTERNAL_CONTAINER_BORDER_COLOR
-}
+UpdateSkinparamsAndLegendEntry("container", $CONTAINER_BG_COLOR, $ELEMENT_FONT_COLOR, $CONTAINER_BORDER_COLOR)
+UpdateSkinparamsAndLegendEntry("external_container", $EXTERNAL_CONTAINER_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_CONTAINER_BORDER_COLOR)
 
 ' Layout
 ' ##################################
 
+SetDefaultLegendEntries("person\nsystem\ncontainer\nexternal_person\nexternal_system\nexternal_container")
+
 !procedure LAYOUT_WITH_LEGEND()
 hide stereotype
 legend right
@@ -516,36 +812,36 @@ endlegend
 !endif
 !endfunction
 
-!unquoted procedure Container($alias, $label, $techn, $descr="", $sprite="")
-rectangle "$getContainer($label, $techn, $descr, $sprite)" <<container>> as $alias
+!unquoted procedure Container($alias, $label, $techn, $descr="", $sprite="", $tags="")
+rectangle "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias
 !endprocedure
 
-!unquoted procedure ContainerDb($alias, $label, $techn, $descr="", $sprite="")
-database "$getContainer($label, $techn, $descr, $sprite)" <<container>> as $alias
+!unquoted procedure ContainerDb($alias, $label, $techn, $descr="", $sprite="", $tags="")
+database "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias
 !endprocedure
 
-!unquoted procedure ContainerQueue($alias, $label, $techn, $descr="", $sprite="")
-queue "$getContainer($label, $techn, $descr, $sprite)" <<container>> as $alias
+!unquoted procedure ContainerQueue($alias, $label, $techn, $descr="", $sprite="", $tags="")
+queue "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias
 !endprocedure
 
-!unquoted procedure Container_Ext($alias, $label, $techn, $descr="", $sprite="")
-rectangle "$getContainer($label, $techn, $descr, $sprite)" <<external_container>> as $alias
+!unquoted procedure Container_Ext($alias, $label, $techn, $descr="", $sprite="", $tags="")
+rectangle "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias
 !endprocedure
 
-!unquoted procedure ContainerDb_Ext($alias, $label, $techn, $descr="", $sprite="")
-database "$getContainer($label, $techn, $descr, $sprite)" <<external_container>> as $alias
+!unquoted procedure ContainerDb_Ext($alias, $label, $techn, $descr="", $sprite="", $tags="")
+database "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias
 !endprocedure
 
-!unquoted procedure ContainerQueue_Ext($alias, $label, $techn, $descr="", $sprite="")
-queue "$getContainer($label, $techn, $descr, $sprite)" <<external_container>> as $alias
+!unquoted procedure ContainerQueue_Ext($alias, $label, $techn, $descr="", $sprite="", $tags="")
+queue "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias
 !endprocedure
 
 ' Boundaries
 ' ##################################
 
-!unquoted function Container_Boundary($alias, $label)
-!return Boundary($alias, $label, "Container")
-!endfunction
+!unquoted procedure Container_Boundary($alias, $label, $tags="")
+Boundary($alias, $label, "Container", $tags)
+!endprocedure
 
 title System Context diagram for Internet Banking System
 
@@ -567,6 +863,9 @@ Rel(banking_system, mainframe, "Uses")
 
 
 
+
+
+
 skinparam defaultTextAlignment center
 
 skinparam wrapWidth 200
@@ -597,11 +896,20 @@ skinparam Arrow {
     FontSize 12
 }
 
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor #FFFFFF
+    FontStyle plain
+    BackgroundColor #FFFFFF
+}
+
 skinparam rectangle<<boundary>> {
     Shadowing false
-    StereotypeFontSize 0
+    StereotypeFontSize 6
+    StereotypeFontColor #FFFFFF
     FontColor #444444
     BorderColor #444444
+    BackgroundColor #FFFFFF
     BorderStyle dashed
 }
 
@@ -632,84 +940,10 @@ skinparam rectangle<<boundary>> {
 
 
 
-skinparam rectangle<<person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #08427B
-    BorderColor #073B6F
-}
 
-skinparam rectangle<<external_person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #686868
-    BorderColor #8A8A8A
-}
 
-skinparam rectangle<<system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #1168BD
-    BorderColor #3C7FC0
-}
 
-skinparam rectangle<<external_system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #999999
-    BorderColor #8A8A8A
-}
 
-sprite $person [48x48/16] {
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-0000000000000000000049BCCA7200000000000000000000
-0000000000000000006EFFFFFFFFB3000000000000000000
-00000000000000001CFFFFFFFFFFFF700000000000000000
-0000000000000001EFFFFFFFFFFFFFF80000000000000000
-000000000000000CFFFFFFFFFFFFFFFF6000000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
-0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
-0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
-0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
-00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-000000000000000BFFFFFFFFFFFFFFFF5000000000000000
-0000000000000001DFFFFFFFFFFFFFF70000000000000000
-00000000000000000BFFFFFFFFFFFF500000000000000000
-0000000000000000005DFFFFFFFFA1000000000000000000
-0000000000000000000037ABB96100000000000000000000
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-000000000000025788300000000005886410000000000000
-000000000007DFFFFFFD9643347BFFFFFFFB400000000000
-0000000004EFFFFFFFFFFFFFFFFFFFFFFFFFFB1000000000
-000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFD200000000
-00000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE10000000
-0000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0000000
-000000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5000000
-000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD000000
-000009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF200000
-00000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF600000
-00000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF800000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
-00000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF700000
-000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
-0000008FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3000000
-000000014555555555555555555555555555555300000000
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-}
 
 
 
@@ -725,47 +959,691 @@ sprite $person [48x48/16] {
 
 
 
-skinparam rectangle<<container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #438DD5
-    BorderColor #3C7FC0
-}
 
-skinparam database<<container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #438DD5
-    BorderColor #3C7FC0
-}
 
-skinparam queue<<container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #438DD5
-    BorderColor #3C7FC0
-}
 
-skinparam rectangle<<external_container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #B3B3B3
-    BorderColor #A6A6A6
-}
 
-skinparam database<<external_container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #B3B3B3
-    BorderColor #A6A6A6
-}
 
-skinparam queue<<external_container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #B3B3B3
-    BorderColor #A6A6A6
-}
+
+
+
+skinparam defaultTextAlignment center
+
+skinparam wrapWidth 200
+skinparam maxMessageSize 150
+
+skinparam LegendBorderColor transparent
+skinparam LegendBackgroundColor transparent
+skinparam LegendFontColor #FFFFFF
+
+skinparam rectangle {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam database {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam queue {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam Arrow {
+    Color #666666
+    FontColor #666666
+    FontSize 12
+}
+
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor #FFFFFF
+    FontStyle plain
+    BackgroundColor #FFFFFF
+}
+
+skinparam rectangle<<boundary>> {
+    Shadowing false
+    StereotypeFontSize 6
+    StereotypeFontColor #FFFFFF
+    FontColor #444444
+    BorderColor #444444
+    BackgroundColor #FFFFFF
+    BorderStyle dashed
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+skinparam rectangle<<person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #08427B
+    BorderColor #073B6F
+}
+skinparam database<<person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #08427B
+    BorderColor #073B6F
+}
+skinparam queue<<person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #08427B
+    BorderColor #073B6F
+}
+
+skinparam rectangle<<external_person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #686868
+    BorderColor #8A8A8A
+}
+skinparam database<<external_person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #686868
+    BorderColor #8A8A8A
+}
+skinparam queue<<external_person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #686868
+    BorderColor #8A8A8A
+}
+
+skinparam rectangle<<system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #1168BD
+    BorderColor #3C7FC0
+}
+skinparam database<<system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #1168BD
+    BorderColor #3C7FC0
+}
+skinparam queue<<system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #1168BD
+    BorderColor #3C7FC0
+}
+
+skinparam rectangle<<external_system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #999999
+    BorderColor #8A8A8A
+}
+skinparam database<<external_system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #999999
+    BorderColor #8A8A8A
+}
+skinparam queue<<external_system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #999999
+    BorderColor #8A8A8A
+}
+
+
+
+
+sprite $person [48x48/16] {
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+000000000000025788300000000005886410000000000000
+000000000007DFFFFFFD9643347BFFFFFFFB400000000000
+0000000004EFFFFFFFFFFFFFFFFFFFFFFFFFFB1000000000
+000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFD200000000
+00000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE10000000
+0000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0000000
+000000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5000000
+000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD000000
+000009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF200000
+00000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF600000
+00000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF800000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
+00000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF700000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+0000008FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3000000
+000000014555555555555555555555555555555300000000
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+}
+
+sprite $person2 [48x48/16] {
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000002578888300000000005888864100000000000
+0000000007DFFFFFFFFD9643347BFFFFFFFFFB4000000000
+00000004EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB10000000
+0000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD2000000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+00003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+0000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF50000
+0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0000
+0009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+0009FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFF2000
+0003FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFD0000
+0000BFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFF50000
+00003FFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFB00000
+000006FFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFE100000
+0000007FFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFD2000000
+00000004EFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFB10000000
+0000000007DF8FFFFFFFFFFFFFFFFFFFFFF8FB4000000000
+000000000002578888888888888888888864100000000000
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+skinparam defaultTextAlignment center
+
+skinparam wrapWidth 200
+skinparam maxMessageSize 150
+
+skinparam LegendBorderColor transparent
+skinparam LegendBackgroundColor transparent
+skinparam LegendFontColor #FFFFFF
+
+skinparam rectangle {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam database {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam queue {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam Arrow {
+    Color #666666
+    FontColor #666666
+    FontSize 12
+}
+
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor #FFFFFF
+    FontStyle plain
+    BackgroundColor #FFFFFF
+}
+
+skinparam rectangle<<boundary>> {
+    Shadowing false
+    StereotypeFontSize 6
+    StereotypeFontColor #FFFFFF
+    FontColor #444444
+    BorderColor #444444
+    BackgroundColor #FFFFFF
+    BorderStyle dashed
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+skinparam rectangle<<person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #08427B
+    BorderColor #073B6F
+}
+skinparam database<<person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #08427B
+    BorderColor #073B6F
+}
+skinparam queue<<person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #08427B
+    BorderColor #073B6F
+}
+
+skinparam rectangle<<external_person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #686868
+    BorderColor #8A8A8A
+}
+skinparam database<<external_person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #686868
+    BorderColor #8A8A8A
+}
+skinparam queue<<external_person>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #686868
+    BorderColor #8A8A8A
+}
+
+skinparam rectangle<<system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #1168BD
+    BorderColor #3C7FC0
+}
+skinparam database<<system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #1168BD
+    BorderColor #3C7FC0
+}
+skinparam queue<<system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #1168BD
+    BorderColor #3C7FC0
+}
+
+skinparam rectangle<<external_system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #999999
+    BorderColor #8A8A8A
+}
+skinparam database<<external_system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #999999
+    BorderColor #8A8A8A
+}
+skinparam queue<<external_system>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #999999
+    BorderColor #8A8A8A
+}
+
+
+
+
+sprite $person [48x48/16] {
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+000000000000025788300000000005886410000000000000
+000000000007DFFFFFFD9643347BFFFFFFFB400000000000
+0000000004EFFFFFFFFFFFFFFFFFFFFFFFFFFB1000000000
+000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFD200000000
+00000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE10000000
+0000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0000000
+000000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5000000
+000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD000000
+000009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF200000
+00000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF600000
+00000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF800000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
+00000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF700000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+0000008FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3000000
+000000014555555555555555555555555555555300000000
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+}
+
+sprite $person2 [48x48/16] {
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000002578888300000000005888864100000000000
+0000000007DFFFFFFFFD9643347BFFFFFFFFFB4000000000
+00000004EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB10000000
+0000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD2000000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+00003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+0000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF50000
+0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0000
+0009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+0009FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFF2000
+0003FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFD0000
+0000BFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFF50000
+00003FFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFB00000
+000006FFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFE100000
+0000007FFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFD2000000
+00000004EFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFB10000000
+0000000007DF8FFFFFFFFFFFFFFFFFFFFFF8FB4000000000
+000000000002578888888888888888888864100000000000
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+skinparam rectangle<<container>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #438DD5
+    BorderColor #3C7FC0
+}
+skinparam database<<container>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #438DD5
+    BorderColor #3C7FC0
+}
+skinparam queue<<container>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #438DD5
+    BorderColor #3C7FC0
+}
+
+skinparam rectangle<<external_container>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #B3B3B3
+    BorderColor #A6A6A6
+}
+skinparam database<<external_container>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #B3B3B3
+    BorderColor #A6A6A6
+}
+skinparam queue<<external_container>> {
+    StereotypeFontColor #FFFFFF
+    FontColor #FFFFFF
+    BackgroundColor #B3B3B3
+    BorderColor #A6A6A6
+}
+
+
 
 
 
@@ -782,7 +1660,7 @@ skinparam queue<<external_container>> {
 title System Context diagram for Internet Banking System
 
 rectangle "<$person>\n==Banking Customer\n\n A customer of the bank, with personal bank accounts." <<person>> as customer
-rectangle "==Internet Banking System\n\n Allows customers to check their accounts." <<system>> as banking_system
+rectangle "==Internet Banking System\n\n Allows customers to check their accounts." <<system>> as banking_system 
 
 rectangle "==E-mail system\n\n The internal Microsoft Exchange e-mail system." <<external_system>> as mail_system
 rectangle "==Mainframe Banking System\n\n Stores all of the core banking information." <<external_system>> as mainframe
@@ -793,7 +1671,7 @@ banking_system ->> mail_system : **Sends e-mails**\n//<size:12>[SMTP]</size>//
 banking_system - ->> mainframe : **Uses**
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/conguide/2.0.0-M5/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg b/content/conguide/2.0.0-M5/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg
index 05ba901..63ff74d 100644
--- a/content/conguide/2.0.0-M5/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg
+++ b/content/conguide/2.0.0-M5/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="196px" preserveAspectRatio="none" style="width:367px;height:196px;" version="1.1" viewBox="0 0 367 196" width="367px" zoomAndPan="magnify"><defs><filter height="300%" id="f1fbfkwplcf7tv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorM [...]
-class Car--><rect codeLine="1" fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Car" style="stroke:#A80036;stroke-width:1.5;" width="49" x="152.5" y="7"/><ellipse cx="167.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M163.4375,23.1406 Q163.4375,19.6875 164.5313,18.0625 Q165.6406,16.4219 167.8594,16.4219 Q169.0625,16.4219 170.3281,17.0781 L170.3281,19.125 Q168.875,18.3438 167.9375,18.3438 Q165.4844,18.3438 165.4844,23.1406 Q165.48 [...]
-class Driver--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Driver" style="stroke:#A80036;stroke-width:1.5;" width="62" x="7" y="7"/><ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M17.9375,23.1406 Q17.9375,19.6875 19.0313,18.0625 Q20.1406,16.4219 22.3594,16.4219 Q23.5625,16.4219 24.8281,17.0781 L24.8281,19.125 Q23.375,18.3438 22.4375,18.3438 Q19.9844,18.3438 19.9844,23.1406 Q19.9844,25.8438 20.6094,26.9063  [...]
-class Wheel--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Wheel" style="stroke:#A80036;stroke-width:1.5;" width="63" x="290.5" y="7"/><ellipse cx="305.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M301.4375,23.1406 Q301.4375,19.6875 302.5313,18.0625 Q303.6406,16.4219 305.8594,16.4219 Q307.0625,16.4219 308.3281,17.0781 L308.3281,19.125 Q306.875,18.3438 305.9375,18.3438 Q303.4844,18.3438 303.4844,23.1406 Q303.4844,25.843 [...]
-class Person--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Person" style="stroke:#A80036;stroke-width:1.5;" width="67" x="143.5" y="134"/><ellipse cx="158.5" cy="150" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M154.4375,150.1406 Q154.4375,146.6875 155.5313,145.0625 Q156.6406,143.4219 158.8594,143.4219 Q160.0625,143.4219 161.3281,144.0781 L161.3281,146.125 Q159.875,145.3438 158.9375,145.3438 Q156.4844,145.3438 156.4844,150.1406 [...]
-link Driver to Car--><path codeLine="3" d="M69.19,31 C94.33,31 129.18,31 152.38,31 " fill="none" id="Driver-Car" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="96.25,18.7725,87.2049,15.8335,87.2049,21.7114,96.25,18.7725" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="100.25" y="23.6855">drives</text><!--MD5=[6190aadcc963d15c02367c0199cc5452]
-reverse link Car to Wheel--><path codeLine="4" d="M214.61,31 C238.14,31 268.13,31 290.43,31 " fill="none" id="Car-backto-Wheel" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="201.6,31,207.6,35,213.6,31,207.6,27,201.6,31" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="229,18.7725,219.9549,15.8335,219.9549,21.7114,229,18.7725" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAd [...]
-link Car to Person--><path codeLine="5" d="M177,55.22 C177,77.67 177,111.5 177,133.91 " fill="none" id="Car-Person" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="182,89.7725,179.0611,98.8175,184.9389,98.8175,182,89.7725" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="30" x="191" y="99.6855">owns</text><!--MD5=[fbad7fb825cb0d1f29810cf350d22d7e]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:369px;height:194px;" version="1.1" viewBox="0 0 369 194" width="369px" zoomAndPan="magnify"><defs><filter height="300%" id="f1fbfkwplcf7tv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorM [...]
+class Car--><rect codeLine="1" fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Car" style="stroke:#A80036;stroke-width:1.5;" width="52" x="152.5" y="7"/><ellipse cx="167.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M166.8594,26.7813 Q167.6563,26.7813 168.2188,26.5938 Q168.7969,26.3906 169.0313,26.1719 Q169.2813,25.9375 169.5156,25.75 Q169.7656,25.5469 169.9844,25.5469 Q170.3281,25.5469 170.5781,25.8125 Q170.8438,26.0625 170.843 [...]
+class Driver--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Driver" style="stroke:#A80036;stroke-width:1.5;" width="63" x="7" y="7"/><ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M21.3594,26.7813 Q22.1563,26.7813 22.7188,26.5938 Q23.2969,26.3906 23.5313,26.1719 Q23.7813,25.9375 24.0156,25.75 Q24.2656,25.5469 24.4844,25.5469 Q24.8281,25.5469 25.0781,25.8125 Q25.3438,26.0625 25.3438,26.3906 Q25.3438,27.125 2 [...]
+class Wheel--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Wheel" style="stroke:#A80036;stroke-width:1.5;" width="64" x="291.5" y="7"/><ellipse cx="306.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M305.8594,26.7813 Q306.6563,26.7813 307.2188,26.5938 Q307.7969,26.3906 308.0313,26.1719 Q308.2813,25.9375 308.5156,25.75 Q308.7656,25.5469 308.9844,25.5469 Q309.3281,25.5469 309.5781,25.8125 Q309.8438,26.0625 309.8438,26.3906 [...]
+class Person--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Person" style="stroke:#A80036;stroke-width:1.5;" width="68" x="144.5" y="132"/><ellipse cx="159.5" cy="148" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M158.8594,151.7813 Q159.6563,151.7813 160.2188,151.5938 Q160.7969,151.3906 161.0313,151.1719 Q161.2813,150.9375 161.5156,150.75 Q161.7656,150.5469 161.9844,150.5469 Q162.3281,150.5469 162.5781,150.8125 Q162.8438,151.0625 [...]
+link Driver to Car--><path codeLine="3" d="M70.27,31 C95.12,31 129.24,31 152.48,31 " fill="none" id="Driver-Car" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="97.25,19.8,88.2049,16.8611,88.2049,22.7389,97.25,19.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="33" x="101.25" y="25">drives</text><!--MD5=[6190aadcc963d15c02367c0199cc5452]
+reverse link Car to Wheel--><path codeLine="4" d="M217.92,31 C240.96,31 269.69,31 291.35,31 " fill="none" id="Car-backto-Wheel" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="204.76,31,210.76,35,216.76,31,210.76,27,204.76,31" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="232,19.8,222.9549,16.8611,222.9549,22.7389,232,19.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdj [...]
+link Car to Person--><path codeLine="5" d="M178.5,55.14 C178.5,77.13 178.5,110.01 178.5,131.97 " fill="none" id="Car-Person" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="183.5,88.8,180.5611,97.8451,186.4389,97.8451,183.5,88.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="192.5" y="99">owns</text><!--MD5=[719ead63b42f7c95d37dcbaec6c43af2]
 @startuml
 class Car
 
@@ -14,7 +14,7 @@ Car *- Wheel : have 4 >
 Car - - Person : < owns
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/conguide/2.0.0-M5/documentation/about.html b/content/conguide/2.0.0-M5/documentation/about.html
index af35b52..4aba4c5 100644
--- a/content/conguide/2.0.0-M5/documentation/about.html
+++ b/content/conguide/2.0.0-M5/documentation/about.html
@@ -444,7 +444,7 @@ Details on these generators is described on the <a href="tooling.html" class="pa
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html b/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html
index 9fd0e01..d4f68d5 100644
--- a/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html
+++ b/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html
@@ -1810,7 +1810,7 @@ But this should become seamless in the future.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html b/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html
index 34702ea..d5052c1 100644
--- a/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html
+++ b/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html
@@ -536,7 +536,7 @@ The lower case flags skip steps, while the upper case flags exclude all steps ex
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/documentation/tooling.html b/content/conguide/2.0.0-M5/documentation/tooling.html
index 7f7f0fa..0ff2f04 100644
--- a/content/conguide/2.0.0-M5/documentation/tooling.html
+++ b/content/conguide/2.0.0-M5/documentation/tooling.html
@@ -434,7 +434,7 @@ TODO - v2, to document
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/eclipse/about.html b/content/conguide/2.0.0-M5/eclipse/about.html
index f78e5a5..b4cc55c 100644
--- a/content/conguide/2.0.0-M5/eclipse/about.html
+++ b/content/conguide/2.0.0-M5/eclipse/about.html
@@ -447,7 +447,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/git/about.html b/content/conguide/2.0.0-M5/git/about.html
index 6c9f0bc..108ce4a 100644
--- a/content/conguide/2.0.0-M5/git/about.html
+++ b/content/conguide/2.0.0-M5/git/about.html
@@ -720,7 +720,7 @@ git reset --hard <em>shaId</em> <i class="conum" data-value="1"></i><b>(1)</b></
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/2.0.0-M5/intellij/about.html b/content/conguide/2.0.0-M5/intellij/about.html
index 9a47882..0461e92 100644
--- a/content/conguide/2.0.0-M5/intellij/about.html
+++ b/content/conguide/2.0.0-M5/intellij/about.html
@@ -431,7 +431,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg b/content/core/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg
index e79c088..c69dc51 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:241px;height:188px;" version="1.1" viewBox="0 0 241 188" width="241px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="178" x="25" y="18.9492">Mapping [...]
-cluster Mappings\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,224,74.7383,224,158.9492,16,158.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="60" x="45.5" y="47.6875">Mappings</text><text fill="#000000" font-family="sans-serif" font [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="176" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="156" x="42" y="114.293">Apache Isis Mappings</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="61.5" y="129.5703">[Container: packaging: pom]</text><text fill="#000000" font-family="sans-serif" f [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="176px" preserveAspectRatio="none" style="width:254px;height:176px;" version="1.1" viewBox="0 0 254 176" width="254px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="181" x="30" y="17.9999">Mapping [...]
+cluster Mappings\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,237,67.1997,237,147.5999,16,147.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="68" x="49.5" y="43.5998">Mappings</text><text fill="#000000" font-family="sans-serif" font [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="42" y="106.0999">Apache Isis Mappings</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="66.5" y="119.2999">[Container: packaging: pom]</text><text fill="#000000" font-family="sans-serif" fon [...]
 @startuml(id=Mappings)
 title Mappings - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Mappings\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg b/content/core/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg
index 26b37d0..fac951b 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="546px" preserveAspectRatio="none" style="width:846px;height:546px;" version="1.1" viewBox="0 0 846 546" width="846px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="183" x="325" y="18.9492">Markdo [...]
-cluster Markdown\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,829,74.7383,829,516.9492,16,516.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="63" x="44" y="47.6875">Markdown</text><text fill="#000000" font-family="sans-serif" font-s [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="314" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="324" y="450.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="90" x="377.5" y="471.8867">(MetaModel)</text><text fill="#FFFFFE" font-family="s [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="314" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="324" y="338.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="93" x="376" y="359.8867">(Persistence)</text><text fill="#FFFFFE" font-family="s [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="314" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="324" y="226.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="395.5" y="247.8867">(applib)</text><text fill="#FFFFFE" font-family="sans [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="32" y="256.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="42" y="283.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="112.5" y="304.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="596" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="606" y="338.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="157" x="626" y="359.8867">(persistence jdo DN5)</text><text fill="#FFFFFE" font- [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="596" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="606" y="114.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="73" x="668" y="135.8867">(ui wicket)</text><text fill="#FFFFFE" font-family="sans [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="314" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="324" y="114.293">Apache Isis Val - Markdown</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="23" x="411" y="135.8867">(ui)</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-link 5 to 6--><path d="M531.35,349.9492 C550.65,349.9492 570.8,349.9492 590.24,349.9492 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="595.7,349.9492,586.7,345.9492,590.7,349.9492,586.7,353.9492,595.7,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="565" y="346.4766"/><!--MD5=[d209f2622dd5d3103b9c9b4670e2d6db]
-link 2 to 4--><path d="M198.57,333.5392 C231.79,355.5292 274.73,383.1492 314,405.9492 C322.6,410.9392 331.69,415.9992 340.8,420.9292 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="345.27,423.3392,339.2452,415.5481,340.8686,420.967,335.4496,422.5904,345.27,423.3392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="283" [...]
-link 2 to 5--><path d="M249.35,316.1392 C268.81,319.9592 289.14,323.9492 308.74,327.7992 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="313.7,328.7792,305.6307,323.1324,308.7922,327.8233,304.1013,330.9849,313.7,328.7792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="283" y="319.4766"/><!--MD5=[eeb69082328d10abd3b14 [...]
-link 2 to 3--><path d="M249.35,272.9892 C268.81,269.0292 289.14,264.8892 308.74,260.9092 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="313.7,259.8892,304.0819,257.7696,308.801,260.889,305.6816,265.6081,313.7,259.8892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="283" y="263.4766"/><!--MD5=[f03a35d0a29bcf5b4caf40b [...]
-link 2 to 7--><path d="M197.32,256.3492 C230.66,233.8092 274.15,205.2992 314,181.9492 C322.58,176.9192 331.66,171.8392 340.76,166.8992 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="345.22,164.4792,335.4016,165.2527,340.8245,166.8625,339.2148,172.2854,345.22,164.4792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 7 to 8--><path d="M531.35,125.9492 C550.65,125.9492 570.8,125.9492 590.24,125.9492 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="595.7,125.9492,586.7,121.9492,590.7,125.9492,586.7,129.9492,595.7,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="565" y="122.4766"/><text fill="#000000" font-family="sans-s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:764px;height:509px;" version="1.1" viewBox="0 0 764 509" width="764px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="186" x="282.5" y="17.9999">Mark [...]
+cluster Markdown\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,747,67.1997,747,480.5999,16,480.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="71" x="48" y="43.5998">Markdown</text><text fill="#000000" font-family="sans-serif" font-s [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="198" x="263" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="297" y="420.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="178" x="273" y="439.7999">Markdown (MetaModel)</text><text fill="#FFFFFE" font-family="s [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="204" x="260" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="297" y="315.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="270" y="334.7999">Markdown (Persistence)</text><text fill="#FFFFFE" font-family= [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="161" x="281.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="297" y="210.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="141" x="291.5" y="229.7999">Markdown (applib)</text><text fill="#FFFFFE" font-family=" [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="32" y="237.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="48.5" y="263.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="143" x="42" y="282.7999">Markdown (parent)</text><text fill="#FFFFFE" font-family="sans- [...]
+entity 6--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="202" x="529" y="279.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="565" y="305.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="178" x="539" y="324.7999">Markdown (persistence</text><text fill="#FFFFFE" font-family=" [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="180" x="540" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="565" y="105.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="160" x="550" y="124.7999">Markdown (ui wicket)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="150" x="287" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="297" y="105.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="108" x="308" y="124.7999">Markdown (ui)</text><text fill="#FFFFFE" font-family="sans-seri [...]
+link 5 to 6--><path d="M464.32,324.5999 C483.65,324.5999 503.92,324.5999 523.38,324.5999 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="528.84,324.5999,519.84,320.5999,523.84,324.5999,519.84,328.5999,528.84,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="498" y="322.5999"/><!--MD5=[d209f2622dd5d3103b9c9b467 [...]
+link 2 to 4--><path d="M160.24,307.7599 C188.36,328.7399 225.5,355.3499 260,376.5999 C268.48,381.8199 277.52,387.0299 286.58,392.0399 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="291.03,394.4799,285.0551,386.6504,286.6438,392.0796,281.2146,393.6683,291.03,394.4799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="22 [...]
+link 2 to 5--><path d="M195.21,289.6299 C214.24,293.6399 234.81,297.9799 254.77,302.1899 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="259.83,303.2599,251.8437,297.4963,254.9366,302.2327,250.2002,305.3256,259.83,303.2599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="229" y="294.5999"/><!--MD5=[eeb69082328d10abd3b [...]
+link 2 to 3--><path d="M195.21,255.2499 C221.15,249.6699 249.94,243.4799 276.16,237.8399 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="281.37,236.7199,271.7276,234.7137,276.4831,237.7773,273.4195,242.5327,281.37,236.7199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="229" y="246.5999"/><!--MD5=[f03a35d0a29bcf5b4ca [...]
+link 2 to 7--><path d="M158.81,237.5699 C187.01,215.9699 224.75,188.3299 260,166.5999 C267.93,161.7099 276.38,156.8499 284.87,152.1799 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="289.6,149.6099,279.7826,150.3967,285.2078,151.9991,283.6054,157.4243,289.6,149.6099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="229 [...]
+link 7 to 8--><path d="M437.1,114.5999 C467.3,114.5999 502.59,114.5999 534.6,114.5999 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="539.71,114.5999,530.71,110.5999,534.71,114.5999,530.71,118.5999,539.71,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="498" y="112.5999"/><text fill="#000000" font-family="san [...]
 @startuml(id=Markdown)
 title Markdown - Containers
 caption Artifact Hierarchy (Maven)
@@ -78,7 +78,7 @@ package "Markdown\n[Software System]" {
 7 .[#707070].> 8 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg b/content/core/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg
index e6a0160..2925710 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:520px;height:434px;" version="1.1" viewBox="0 0 520 434" width="520px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="212" x="147.5" y="18.9492">Vaad [...]
-cluster Vaadin Viewer\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,503,74.7383,503,404.9492,16,404.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="87" x="32" y="47.6875">Vaadin Viewer</text><text fill="#000000" font-family="sans-ser [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="32" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="42" y="226.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="49" x="105" y="247.8867">Vaadin</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="292" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="302" y="338.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="108" x="335.5" y="359.8867">Vaadin (Model)</text><text fill="#FFFFFE" font-family= [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="292" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="302" y="226.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="173" x="303" y="247.8867">Vaadin (UI Components)</text><text fill="#FFFFFE" font-f [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="292" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="302" y="114.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="111" x="334" y="135.8867">Vaadin (Viewer)</text><text fill="#FFFFFE" font-family="s [...]
-link 2 to 3--><path d="M219.29,276.4892 C243.61,287.0492 270.06,298.5292 294.65,309.2092 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="299.55,311.3292,292.8995,304.0648,294.9669,309.3304,289.7014,311.3978,299.55,311.3292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="261" y="290.4766"/><!--MD5=[d209f2622dd5d3103b9 [...]
-link 2 to 4--><path d="M227.3,237.9492 C246.52,237.9492 266.75,237.9492 286.14,237.9492 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="291.58,237.9492,282.58,233.9492,286.58,237.9492,282.58,241.9492,291.58,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="261" y="234.4766"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
-link 2 to 5--><path d="M219.29,199.4092 C243.61,188.8492 270.06,177.3692 294.65,166.6892 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="299.55,164.5692,289.7014,164.5007,294.9669,166.5681,292.8995,171.8336,299.55,164.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="261" y="178.4766"/><text fill="#000000" font-fa [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:542px;height:404px;" version="1.1" viewBox="0 0 542 404" width="542px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="219" x="155" y="17.9999">Vaadin [...]
+cluster Vaadin Viewer\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,525,67.1997,525,375.5999,16,375.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="96" x="35.5" y="43.5998">Vaadin Viewer</text><text fill="#000000" font-family="sans-s [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="32" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="42" y="210.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="53" x="108" y="229.7999">Vaadin</text><text fill="#FFFFFE" font-family="sans-serif" [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="303" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="313" y="315.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="114" x="348.5" y="334.7999">Vaadin (Model)</text><text fill="#FFFFFE" font-family [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="207" x="302" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="313" y="210.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="312" y="229.7999">Vaadin (UI Components)</text><text fill="#FFFFFE" font- [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="303" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="313" y="105.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="118" x="346.5" y="124.7999">Vaadin (Viewer)</text><text fill="#FFFFFE" font-family [...]
+link 2 to 3--><path d="M225.45,254.7099 C252.59,265.2999 282.46,276.9699 309.9,287.6699 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="314.64,289.5199,307.7245,282.5073,309.9859,287.6925,304.8007,289.9539,314.64,289.5199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="270.5999"/><!--MD5=[d209f2622dd5d3103b9c [...]
+link 2 to 4--><path d="M237.2,219.5999 C256.51,219.5999 276.78,219.5999 296.29,219.5999 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="301.77,219.5999,292.77,215.5999,296.77,219.5999,292.77,223.5999,301.77,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="217.5999"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
+link 2 to 5--><path d="M225.45,184.4899 C252.59,173.8999 282.46,162.2299 309.9,151.5299 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="314.64,149.6799,304.8007,149.2459,309.9859,151.5072,307.7245,156.6924,314.64,149.6799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="165.5999"/><text fill="#000000" font-fam [...]
 @startuml(id=Vaadin_Viewer)
 title Vaadin Viewer - Containers
 caption Artifact Hierarchy (Maven)
@@ -51,7 +51,7 @@ package "Vaadin Viewer\n[Software System]" {
 2 .[#707070].> 5 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg b/content/core/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg
index 22c408a..2b8c635 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:570px;height:210px;" version="1.1" viewBox="0 0 570 210" width="570px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="262" x="147.5" y="18.9492">Core [...]
-cluster Core: Command Log\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,148,30.9492,155,74.7383,553,74.7383,553,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="155" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="126" x="20" y="47.6875">Core: Command Log</text><text fill="#000000" font-family= [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="42" y="114.293">Apache Isis Ext - Command</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="25" x="129.5" y="135.8867">Log</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="317" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="327" y="114.293">Apache Isis Ext - Command</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="335" y="135.8867">Log Implementation (JDO)</text><text fill="#FFFFFE" font [...]
-link 2 to 3--><path d="M252.01,125.9492 C271.45,125.9492 291.75,125.9492 311.34,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="316.58,125.9492,307.58,121.9492,311.58,125.9492,307.58,129.9492,316.58,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="286" y="122.4766"/><text fill="#000000" font-family=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="214px" preserveAspectRatio="none" style="width:467px;height:214px;" version="1.1" viewBox="0 0 467 214" width="467px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="270" x="92" y="17.9999">Core: C [...]
+cluster Core: Command Log\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,163,27.5999,170,67.1997,450,67.1997,450,185.5999,16,185.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="170" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="141" x="20" y="43.5998">Core: Command Log</text><text fill="#000000" font-family= [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="151" x="32" y="89.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="42" y="115.5999">Apache Isis Ext -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="113" x="51" y="134.7999">Command Log</text><text fill="#FFFFFE" font-family="sans-serif" fo [...]
+entity 3--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="186" x="248" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="275.5" y="105.5999">Apache Isis Ext -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="113" x="282.5" y="124.7999">Command Log</text><text fill="#FFFFFE" font-family="sans-se [...]
+link 2 to 3--><path d="M183.02,124.5999 C202.03,124.5999 222.75,124.5999 242.71,124.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="247.77,124.5999,238.77,120.5999,242.77,124.5999,238.77,128.5999,247.77,124.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="217" y="122.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=Core:_Command_Log)
 title Core: Command Log - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "Core: Command Log\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg b/content/core/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg
index aa0e7b7..a04d67e 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="546px" preserveAspectRatio="none" style="width:514px;height:546px;" version="1.1" viewBox="0 0 514 546" width="514px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="142" x="179.5" y="18.9492">Exce [...]
-cluster Excel\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,497,74.7383,497,516.9492,16,516.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="32" x="59.5" y="47.6875">Excel</text><text fill="#000000" font-family="sans-serif" font-size= [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="289" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="299" y="450.293">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="65" x="352.5" y="471.8867">(Fixtures)</text><text fill="#FFFFFE" font-family="sans- [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="289" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="299" y="338.293">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="88" x="341" y="359.8867">(Integ Tests)</text><text fill="#FFFFFE" font-family="sans [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="289" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="299" y="226.293">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="358" y="247.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="32" y="256.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="42" y="283.293">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="100" y="304.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="289" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="299" y="114.293">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="117" x="326.5" y="135.8867">(testing support)</text><text fill="#FFFFFE" font-family [...]
-link 2 to 4--><path d="M182.39,333.4592 C213.18,355.2992 252.84,382.7992 289,405.9492 C296.62,410.8292 304.66,415.8092 312.71,420.6992 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="317.18,423.3992,311.5522,415.3166,312.9027,420.8099,307.4094,422.1604,317.18,423.3992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 5--><path d="M224.32,315.5092 C243.75,319.6992 264.24,324.1192 283.84,328.3492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="288.8,329.4192,280.8495,323.6064,283.9131,328.3618,279.1576,331.4254,288.8,329.4192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="258" y="319.4766"/><!--MD5=[eeb69082328d10abd3b14 [...]
-link 2 to 3--><path d="M224.32,273.6392 C243.75,269.2992 264.24,264.7192 283.84,260.3392 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="288.8,259.2292,279.1466,257.2768,283.9191,260.3139,280.882,265.0863,288.8,259.2292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="258" y="263.4766"/><!--MD5=[8d5e64f07a3a026530162c [...]
-link 2 to 6--><path d="M181.22,256.4292 C212.13,234.0492 252.3,205.6692 289,181.9492 C296.53,177.0792 304.48,172.1192 312.45,167.2692 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="316.88,164.5792,307.1094,165.8181,312.6027,167.1685,311.2522,172.6618,316.88,164.5792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="25 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:536px;height:509px;" version="1.1" viewBox="0 0 536 509" width="536px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="146" x="188.5" y="17.9999">Exce [...]
+cluster Excel\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,519,67.1997,519,480.5999,16,480.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="37" x="65" y="43.5998">Excel</text><text fill="#000000" font-family="sans-serif" font-size="1 [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="300" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="310" y="420.5999">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="72" x="365.5" y="439.7999">(Fixtures)</text><text fill="#FFFFFE" font-family="sans [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="300" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="310" y="315.5999">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="95" x="354" y="334.7999">(Integ Tests)</text><text fill="#FFFFFE" font-family="san [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="300" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="310" y="210.5999">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="373" y="229.7999">(applib)</text><text fill="#FFFFFE" font-family="sans-ser [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="32" y="237.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="42" y="263.5999">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="104" y="282.7999">(parent)</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="300" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="310" y="105.5999">Apache Isis Sub - Excel</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="338.5" y="124.7999">(testing support)</text><text fill="#FFFFFE" font-famil [...]
+link 2 to 4--><path d="M187.91,307.5999 C220.03,328.2899 261.93,354.6399 300,376.5999 C308.88,381.7199 318.3,386.9499 327.68,392.0299 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="332.27,394.5099,326.2452,386.7187,327.8686,392.1377,322.4496,393.761,332.27,394.5099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="269 [...]
+link 2 to 5--><path d="M235.06,292.2599 C254.59,296.0799 275.12,300.0899 294.81,303.9399 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="299.79,304.9099,291.7238,299.2587,294.8827,303.9513,290.1901,307.1103,299.79,304.9099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="269" y="296.5999"/><!--MD5=[eeb69082328d10abd3b [...]
+link 2 to 3--><path d="M235.06,252.5599 C254.59,248.6699 275.12,244.5799 294.81,240.6599 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="299.79,239.6699,290.184,237.4964,294.8855,240.6422,291.7397,245.3437,299.79,239.6699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="269" y="244.5999"/><!--MD5=[8d5e64f07a3a02653016 [...]
+link 2 to 6--><path d="M186.65,237.4499 C218.86,216.1799 261.29,188.9499 300,166.5999 C308.25,161.8299 316.99,157.0099 325.73,152.3099 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="330.58,149.7199,320.7578,150.4439,326.1726,152.081,324.5356,157.4958,330.58,149.7199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="26 [...]
 @startuml(id=Excel)
 title Excel - Containers
 caption Artifact Hierarchy (Maven)
@@ -60,7 +60,7 @@ package "Excel\n[Software System]" {
 2 .[#707070].> 6 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg b/content/core/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg
index ebee18f..bdb5d32 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:297px;height:188px;" version="1.1" viewBox="0 0 297 188" width="297px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="288" x="2" y="18.9492">Core: Mo [...]
-cluster Core: Model Annotation\n[Software System]--><polygon fill="#FFFFFF" points="36,30.9492,188,30.9492,195,74.7383,268,74.7383,268,158.9492,36,158.9492,36,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="36" x2="195" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="146" x="40" y="47.6875">Core: Model Annotation</text><text fill="#000000" fo [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="52" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="62" y="114.293">Apache Isis Ext - @Model</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="97.5" y="129.5703">[Container: packaging: jar]</text><text fill="#000000" font-family="sans-seri [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="176px" preserveAspectRatio="none" style="width:301px;height:176px;" version="1.1" viewBox="0 0 301 176" width="301px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="292" x="2" y="17.9999">Core: Mo [...]
+cluster Core: Model Annotation\n[Software System]--><polygon fill="#FFFFFF" points="31,27.5999,199,27.5999,206,67.1997,277,67.1997,277,147.5999,31,147.5999,31,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="31" x2="206" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="162" x="35" y="43.5998">Core: Model Annotation</text><text fill="#000000" fo [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="214" x="47" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="57" y="106.0999">Apache Isis Ext - @Model</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="98.5" y="119.2999">[Container: packaging: jar]</text><text fill="#000000" font-family="sans-serif" [...]
 @startuml(id=Core:_Model_Annotation)
 title Core: Model Annotation - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Core: Model Annotation\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg b/content/core/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg
index 5219bb1..8b37fbe 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="658px" preserveAspectRatio="none" style="width:819px;height:658px;" version="1.1" viewBox="0 0 819 658" width="819px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="200" x="303" y="18.9492">Subdom [...]
-cluster Subdomains\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,802,74.7383,802,628.9492,16,628.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="78" x="36.5" y="47.6875">Subdomains</text><text fill="#000000" font-family="sans-serif"  [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="190" x="584" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="594" y="562.293">Apache Isis Sub - Docx</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="652" y="583.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-serif [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="190" x="305" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="315" y="562.293">Apache Isis Sub - Docx</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="372" y="583.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-serif [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="159" x="599.5" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="125" x="614" y="450.293">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="609.5" y="471.8867">Freemarker (applib)</text><text fill="#FFFFFE" font-family= [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="161" x="319.5" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="125" x="335" y="450.293">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="141" x="329.5" y="471.8867">Freemarker (parent)</text><text fill="#FFFFFE" font-family= [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="187" x="585.5" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="162" x="595.5" y="338.293">Apache Isis Sub - Ognl</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="652" y="359.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="187" x="306.5" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="162" x="316.5" y="338.293">Apache Isis Sub - Ognl</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="372" y="359.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 10--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="214" x="572" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="189" x="582" y="226.293">Apache Isis Sub - PDF Box</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="652" y="247.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 9--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="214" x="293" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="189" x="303" y="226.293">Apache Isis Sub - PDF Box</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="372" y="247.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-se [...]
-entity 12--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="177" x="590.5" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="152" x="600.5" y="114.293">Apache Isis Sub - Zip</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="652" y="135.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-se [...]
-entity 11--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="177" x="311.5" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="152" x="321.5" y="114.293">Apache Isis Sub - Zip</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="372" y="135.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-se [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="196" x="32" y="322.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="176" x="42" y="349.293">Apache Isis Subdomains</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="71.5" y="364.5703">[Container: packaging: pom]</text><!--MD5=[b1f22f0c97e7f2b556a5a2d67c42ac53]
-link 3 to 4--><path d="M495.17,573.9492 C522.04,573.9492 551.4,573.9492 578.58,573.9492 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="583.62,573.9492,574.62,569.9492,578.62,573.9492,574.62,577.9492,583.62,573.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="541" y="570.4766"/><!--MD5=[deed8cab30c10dbe2727e65517d240f0]
-link 5 to 6--><path d="M480.75,461.9492 C516.24,461.9492 558.06,461.9492 594.03,461.9492 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="599.29,461.9492,590.29,457.9492,594.29,461.9492,590.29,465.9492,599.29,461.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="541" y="458.4766"/><!--MD5=[5ca979b543d038a4b12f05f8f [...]
-link 7 to 8--><path d="M493.62,349.9492 C521.46,349.9492 552.08,349.9492 580.24,349.9492 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="585.47,349.9492,576.47,345.9492,580.47,349.9492,576.47,353.9492,585.47,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="541" y="346.4766"/><!--MD5=[d626a4137f042c9ed96693ba9 [...]
-link 9 to 10--><path d="M507.3,237.9492 C526.77,237.9492 547.14,237.9492 566.74,237.9492 " fill="none" id="9-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="571.98,237.9492,562.98,233.9492,566.98,237.9492,562.98,241.9492,571.98,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="541" y="234.4766"/><!--MD5=[0a5a2d32bb972d30673e2f26 [...]
-link 11 to 12--><path d="M488.64,125.9492 C519.36,125.9492 553.95,125.9492 585.08,125.9492 " fill="none" id="11-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="590.45,125.9492,581.45,121.9492,585.45,125.9492,581.45,129.9492,590.45,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="541" y="122.4766"/><!--MD5=[eeb69082328d10abd3b14 [...]
-link 2 to 3--><path d="M152.87,377.5792 C182.06,413.1892 236.65,475.5792 293,517.9492 C299.75,523.0292 307.02,527.8992 314.48,532.5092 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.15,535.3392,313.542,527.2429,314.879,532.7395,309.3824,534.0765,319.15,535.3392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262 [...]
-link 2 to 5--><path d="M196.9,377.4892 C232.35,392.3092 276.46,410.7392 314.42,426.5992 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.49,428.7192,312.7286,421.5579,314.8767,426.7911,309.6436,428.9392,319.49,428.7192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262" y="401.4766"/><!--MD5=[f03a35d0a29bcf5b4caf [...]
-link 2 to 7--><path d="M228.13,349.9492 C251.91,349.9492 277.36,349.9492 301.17,349.9492 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="306.22,349.9492,297.22,345.9492,301.22,349.9492,297.22,353.9492,306.22,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262" y="346.4766"/><!--MD5=[676073e7019c75b59fc2b0561 [...]
-link 2 to 9--><path d="M196.9,322.4092 C228.57,309.1692 267.15,293.0492 302.08,278.4492 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="306.76,276.4992,296.9136,276.2793,302.1467,278.4274,299.9986,283.6605,306.76,276.4992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262" y="292.4766"/><!--MD5=[350ab8b289b532334afa [...]
-link 2 to 11--><path d="M152.87,322.3192 C182.06,286.7092 236.65,224.3192 293,181.9492 C299.75,176.8692 307.02,171.9992 314.48,167.3892 " fill="none" id="2-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.15,164.5592,309.3824,165.8219,314.879,167.159,313.542,172.6555,319.15,164.5592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="26 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="614px" preserveAspectRatio="none" style="width:807px;height:614px;" version="1.1" viewBox="0 0 807 614" width="807px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="203" x="295.5" y="17.9999">Subd [...]
+cluster Subdomains\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,790,67.1997,790,585.5999,16,585.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="88" x="39.5" y="43.5998">Subdomains</text><text fill="#000000" font-family="sans-serif"  [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="201" x="573" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="177" x="583" y="525.5999">Apache Isis Sub - Docx</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="645" y="544.7999">(applib)</text><text fill="#FFFFFE" font-family="sans-seri [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="201" x="307" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="177" x="317" y="525.5999">Apache Isis Sub - Docx</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="378" y="544.7999">(parent)</text><text fill="#FFFFFE" font-family="sans-seri [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="168" x="589.5" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="133" x="605" y="420.5999">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="148" x="599.5" y="439.7999">Freemarker (applib)</text><text fill="#FFFFFE" font-family [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="170" x="322.5" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="133" x="339" y="420.5999">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="150" x="332.5" y="439.7999">Freemarker (parent)</text><text fill="#FFFFFE" font-family [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="198" x="574.5" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="584.5" y="315.5999">Apache Isis Sub - Ognl</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="645" y="334.7999">(applib)</text><text fill="#FFFFFE" font-family="sans- [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="198" x="308.5" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="318.5" y="315.5999">Apache Isis Sub - Ognl</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="378" y="334.7999">(parent)</text><text fill="#FFFFFE" font-family="sans- [...]
+entity 10--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="576.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="586.5" y="210.5999">Apache Isis Sub - PDF</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="91" x="628" y="229.7999">Box (applib)</text><text fill="#FFFFFE" font-family="s [...]
+entity 9--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="310.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="320.5" y="210.5999">Apache Isis Sub - PDF</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="93" x="361" y="229.7999">Box (parent)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 12--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="581" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="161" x="591" y="105.5999">Apache Isis Sub - Zip</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="645" y="124.7999">(applib)</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 11--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="315" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="161" x="325" y="105.5999">Apache Isis Sub - Zip</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="378" y="124.7999">(parent)</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="210" x="32" y="299.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="42" y="325.0999">Apache Isis Subdomains</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="77" y="338.2999">[Container: packaging: pom]</text><!--MD5=[b1f22f0c97e7f2b556a5a2d67c42ac53]
+link 3 to 4--><path d="M508.31,534.5999 C527.74,534.5999 548.17,534.5999 567.76,534.5999 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="572.99,534.5999,563.99,530.5999,567.99,534.5999,563.99,538.5999,572.99,534.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="542" y="532.5999"/><!--MD5=[deed8cab30c10dbe2727e6551 [...]
+link 5 to 6--><path d="M492.76,429.5999 C522,429.5999 554.86,429.5999 584.4,429.5999 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="589.49,429.5999,580.49,425.5999,584.49,429.5999,580.49,433.5999,589.49,429.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="542" y="427.5999"/><!--MD5=[5ca979b543d038a4b12f05f8f6f2c83d]
+link 7 to 8--><path d="M506.8,324.5999 C527.08,324.5999 548.48,324.5999 568.94,324.5999 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="574.11,324.5999,565.11,320.5999,569.11,324.5999,565.11,328.5999,574.11,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="542" y="322.5999"/><!--MD5=[d626a4137f042c9ed96693ba98ea08de]
+link 9 to 10--><path d="M504.56,219.5999 C526.12,219.5999 549.07,219.5999 570.86,219.5999 " fill="none" id="9-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="576.07,219.5999,567.07,215.5999,571.07,219.5999,567.07,223.5999,576.07,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="542" y="217.5999"/><!--MD5=[0a5a2d32bb972d30673e2f2 [...]
+link 11 to 12--><path d="M500.09,114.5999 C524.42,114.5999 550.78,114.5999 575.4,114.5999 " fill="none" id="11-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="580.62,114.5999,571.62,110.5999,575.62,114.5999,571.62,118.5999,580.62,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="542" y="112.5999"/><!--MD5=[eeb69082328d10abd3b14f [...]
+link 2 to 3--><path d="M161.44,350.1599 C192.57,383.1699 250.25,441.1699 307,481.5999 C314.46,486.9199 322.53,492.0599 330.72,496.9199 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="335.28,499.5899,329.5379,491.5881,330.9663,497.0616,325.4927,498.49,335.28,499.5899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="276 [...]
+link 2 to 5--><path d="M203.34,350.1499 C237.66,363.5699 280.21,380.2099 317.5,394.7999 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="322.49,396.7499,315.5559,389.7557,317.8311,394.9349,312.6519,397.21,322.49,396.7499" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="276" y="375.5999"/><!--MD5=[f03a35d0a29bcf5b4caf40 [...]
+link 2 to 7--><path d="M242.19,324.5999 C262.17,324.5999 283.08,324.5999 303.03,324.5999 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="308.09,324.5999,299.09,320.5999,303.09,324.5999,299.09,328.5999,308.09,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="276" y="322.5999"/><!--MD5=[676073e7019c75b59fc2b0561 [...]
+link 2 to 9--><path d="M203.34,299.0499 C236.02,286.2699 276.18,270.5599 312.14,256.4999 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="316.96,254.6199,307.1207,254.1859,312.3059,256.4472,310.0445,261.6324,316.96,254.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="276" y="270.5999"/><!--MD5=[350ab8b289b532334af [...]
+link 2 to 11--><path d="M161.09,299.0799 C192.07,265.8199 249.82,207.1299 307,166.5999 C313.91,161.6999 321.35,156.9599 328.93,152.4799 " fill="none" id="2-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="333.66,149.7199,323.8685,150.7815,329.3365,152.2312,327.8867,157.6992,333.66,149.7199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x= [...]
 @startuml(id=Subdomains)
 title Subdomains - Containers
 caption Artifact Hierarchy (Maven)
@@ -114,7 +114,7 @@ package "Subdomains\n[Software System]" {
 2 .[#707070].> 11 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg b/content/core/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg
index 9123ce9..46121fc 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="412px" preserveAspectRatio="none" style="width:1039px;height:412px;" version="1.1" viewBox="0 0 1039 412" width="1039px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="188" x="419" y="18.9492">Val [...]
-cluster Valuetypes\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,1022,74.7383,1022,382.9492,16,382.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="68" x="41.5" y="47.6875">Valuetypes</text><text fill="#000000" font-family="sans-serif [...]
-entity 6--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="201" x="546" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="556" y="338.293">Apache Isis Val - SSE (ui)</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="588" y="353.5703">[Container: packaging: pom]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="549.5" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="559.5" y="226.293">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="85" x="604" y="247.8867">Sent Events</text><text fill="#FFFFFE" font-family="s [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="546.5" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="559.5" y="114.293">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="556.5" y="135.8867">Sent Events (metamodel)</text><text fill="#FFFFFE"  [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="287" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="297" y="226.293">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="146" x="311" y="247.8867">Sent Events (parent)</text><text fill="#FFFFFE" font-fam [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="812" y="289.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="822" y="316.293">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="163" x="827.5" y="337.8867">Sent Events (ui wicket)</text><text fill="#FFFFFE" fon [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="190" x="32" y="210.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="42" y="237.293">Apache Isis Value types</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="68.5" y="252.5703">[Container: packaging: pom]</text><!--MD5=[2dfa168d6698efd82f568a8036f37f42]
-link 6 to 7--><path d="M747.1,334.7392 C766.53,333.9192 786.93,333.0592 806.42,332.2392 " fill="none" id="6-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="811.89,332.0092,802.727,328.3982,806.8946,332.2233,803.0695,336.3909,811.89,332.0092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="781" y="330.4766"/><!--MD5=[b2ac855d378984b70ee6a [...]
-link 3 to 6--><path d="M481.26,275.2692 C510.44,286.5892 542.07,298.8492 569.71,309.5692 " fill="none" id="3-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="574.47,311.4092,567.5359,304.4151,569.8111,309.5942,564.6319,311.8694,574.47,311.4092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="515" y="285.4766"/><!--MD5=[b1f22f0c97e7f2b556a [...]
-link 3 to 4--><path d="M481.26,237.9492 C501.7,237.9492 523.35,237.9492 543.98,237.9492 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="549.2,237.9492,540.2,233.9492,544.2,237.9492,540.2,241.9492,549.2,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="515" y="234.4766"/><!--MD5=[c24e363b82b23e873c94edca50a9731f]
-link 3 to 5--><path d="M474.65,199.4092 C499.31,188.7992 526.13,177.2692 551.05,166.5592 " fill="none" id="3-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="555.69,164.5692,545.842,164.4379,551.0943,166.5388,548.9934,171.7911,555.69,164.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="515" y="178.4766"/><!--MD5=[eeb69082328d10abd3b1 [...]
-link 2 to 3--><path d="M222.23,237.9492 C241.42,237.9492 261.7,237.9492 281.14,237.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="286.6,237.9492,277.6,233.9492,281.6,237.9492,277.6,241.9492,286.6,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256" y="234.4766"/><text fill="#000000" font-family="sans-s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="386px" preserveAspectRatio="none" style="width:1081px;height:386px;" version="1.1" viewBox="0 0 1081 386" width="1081px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="192" x="438" y="17.9999">Val [...]
+cluster Valuetypes\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,1064,67.1997,1064,357.5999,16,357.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="76" x="45.5" y="43.5998">Valuetypes</text><text fill="#000000" font-family="sans-serif [...]
+entity 6--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="568" y="290.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="578" y="316.0999">Apache Isis Val - SSE (ui)</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="613.5" y="329.2999">[Container: packaging: pom]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="204" x="571.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="581.5" y="210.5999">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="92" x="627.5" y="229.7999">Sent Events</text><text fill="#FFFFFE" font-family [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="210" x="568.5" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="581.5" y="105.5999">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="578.5" y="124.7999">Sent Events (metamodel)</text><text fill="#FFFFFE" [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="204" x="299" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="309" y="210.5999">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="155" x="323.5" y="229.7999">Sent Events (parent)</text><text fill="#FFFFFE" font- [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="204" x="844" y="271.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="854" y="297.5999">Apache Isis Val - Server</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="172" x="860" y="316.7999">Sent Events (ui wicket)</text><text fill="#FFFFFE" font [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="202" x="32" y="194.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="42" y="220.0999">Apache Isis Value types</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="73" y="233.2999">[Container: packaging: pom]</text><!--MD5=[2dfa168d6698efd82f568a8036f37f42]
+link 6 to 7--><path d="M779.08,312.1199 C798.52,311.4699 818.84,310.7999 838.33,310.1499 " fill="none" id="6-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="843.81,309.9699,834.6782,306.2806,838.8129,310.1412,834.9523,314.2759,843.81,309.9699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="813" y="309.5999"/><!--MD5=[b2ac855d378984b70ee [...]
+link 3 to 6--><path d="M500.8,254.6699 C532.05,265.7499 566.1,277.8399 595.57,288.2999 " fill="none" id="3-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="600.64,290.0999,593.5005,283.3155,595.929,288.4245,590.82,290.853,600.64,290.0999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="537" y="265.5999"/><!--MD5=[b1f22f0c97e7f2b556a5a2d67 [...]
+link 3 to 4--><path d="M503.11,219.5999 C523.58,219.5999 545.17,219.5999 565.83,219.5999 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="571.06,219.5999,562.06,215.5999,566.06,219.5999,562.06,223.5999,571.06,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="537" y="217.5999"/><!--MD5=[c24e363b82b23e873c94edca5 [...]
+link 3 to 5--><path d="M492.45,184.4899 C519.74,173.8999 549.78,162.2299 577.37,151.5299 " fill="none" id="3-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="582.14,149.6799,572.3024,149.2095,577.4792,151.49,575.1986,156.6668,582.14,149.6799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="537" y="165.5999"/><!--MD5=[eeb69082328d10abd3b14 [...]
+link 2 to 3--><path d="M234.18,219.5999 C253.43,219.5999 273.66,219.5999 293.11,219.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="298.58,219.5999,289.58,215.5999,293.58,219.5999,289.58,223.5999,298.58,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="268" y="217.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=Valuetypes)
 title Valuetypes - Containers
 caption Artifact Hierarchy (Maven)
@@ -69,7 +69,7 @@ package "Valuetypes\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg b/content/core/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg
index 64f93d6..6c52022 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="322px" preserveAspectRatio="none" style="width:570px;height:322px;" version="1.1" viewBox="0 0 570 322" width="570px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="287" x="135" y="18.9492">Core:  [...]
-cluster Core: Command Replay\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,168,30.9492,175,74.7383,553,74.7383,553,292.9492,16,292.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="175" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="146" x="20" y="47.6875">Core: Command Replay</text><text fill="#000000" font-f [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="32" y="172.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="42" y="199.293">Apache Isis Ext - Command</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="48" x="118" y="220.8867">Replay</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="317" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="327" y="226.293">Apache Isis Ext - Command</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="129" x="362.5" y="247.8867">Replay for Primary</text><text fill="#FFFFFE" font-fa [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="317" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="327" y="114.293">Apache Isis Ext - Command</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="152" x="351" y="135.8867">Replay for Secondary</text><text fill="#FFFFFE" font-fam [...]
-link 2 to 3--><path d="M252.01,221.3492 C271.53,223.2092 291.93,225.1592 311.59,227.0392 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="316.58,227.5092,308.0103,222.6554,311.6036,227.0244,307.2346,230.6177,316.58,227.5092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="286" y="221.4766"/><!--MD5=[d209f2622dd5d3103b9 [...]
-link 2 to 4--><path d="M252.01,178.2092 C271.53,172.3392 291.93,166.2192 311.59,160.3092 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="316.58,158.8192,306.8119,157.5607,311.7889,160.2494,309.1002,165.2264,316.58,158.8192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="286" y="165.4766"/><text fill="#000000" font-fa [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="339px" preserveAspectRatio="none" style="width:471px;height:339px;" version="1.1" viewBox="0 0 471 339" width="471px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="296" x="81" y="17.9999">Core: C [...]
+cluster Core: Command Replay\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,183,27.5999,190,67.1997,454,67.1997,454,310.5999,16,310.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="190" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="161" x="20" y="43.5998">Core: Command Replay</text><text fill="#000000" font-f [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="156" x="32" y="152.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="44.5" y="178.5999">Apache Isis Ext -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="136" x="42" y="197.7999">Command Replay</text><text fill="#FFFFFE" font-family="sans-ser [...]
+entity 3--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="253" y="204.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="280" y="230.5999">Apache Isis Ext -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="161" x="263" y="249.7999">Command Replay for</text><text fill="#FFFFFE" font-family="san [...]
+entity 4--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="253" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="280" y="105.5999">Apache Isis Ext -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="161" x="263" y="124.7999">Command Replay for</text><text fill="#FFFFFE" font-family="sans [...]
+link 2 to 3--><path d="M188.1,208.0699 C207.21,213.1499 227.92,218.6399 247.83,223.9299 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="252.87,225.2699,245.2023,219.0888,248.0384,223.9833,243.1438,226.8194,252.87,225.2699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="222" y="215.5999"/><!--MD5=[d209f2622dd5d3103b9c [...]
+link 2 to 4--><path d="M188.1,166.7999 C207.21,161.6399 227.92,156.0499 247.83,150.6799 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="252.87,149.3199,243.1384,147.8044,248.0429,150.6233,245.224,155.5278,252.87,149.3199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="222" y="156.5999"/><text fill="#000000" font-fami [...]
 @startuml(id=Core:_Command_Replay)
 title Core: Command Replay - Containers
 caption Artifact Hierarchy (Maven)
@@ -42,7 +42,7 @@ package "Core: Command Replay\n[Software System]" {
 2 .[#707070].> 4 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg b/content/core/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg
index e623d6e..910fd03 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:520px;height:434px;" version="1.1" viewBox="0 0 520 434" width="520px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="212" x="147.5" y="18.9492">Java [...]
-cluster JavaFX Viewer\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,503,74.7383,503,404.9492,16,404.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="87" x="32" y="47.6875">JavaFX Viewer</text><text fill="#000000" font-family="sans-ser [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="32" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="42" y="226.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="48" x="105.5" y="247.8867">JavaFX</text><text fill="#FFFFFE" font-family="sans-serif [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="292" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="302" y="338.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="107" x="336" y="359.8867">JavaFX (Model)</text><text fill="#FFFFFE" font-family="s [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="292" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="302" y="226.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="172" x="303.5" y="247.8867">JavaFX (UI Components)</text><text fill="#FFFFFE" font [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="292" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="302" y="114.293">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="110" x="334.5" y="135.8867">JavaFX (Viewer)</text><text fill="#FFFFFE" font-family= [...]
-link 2 to 3--><path d="M219.29,276.4892 C243.61,287.0492 270.06,298.5292 294.65,309.2092 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="299.55,311.3292,292.8995,304.0648,294.9669,309.3304,289.7014,311.3978,299.55,311.3292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="261" y="290.4766"/><!--MD5=[d209f2622dd5d3103b9 [...]
-link 2 to 4--><path d="M227.3,237.9492 C246.52,237.9492 266.75,237.9492 286.14,237.9492 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="291.58,237.9492,282.58,233.9492,286.58,237.9492,282.58,241.9492,291.58,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="261" y="234.4766"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
-link 2 to 5--><path d="M219.29,199.4092 C243.61,188.8492 270.06,177.3692 294.65,166.6892 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="299.55,164.5692,289.7014,164.5007,294.9669,166.5681,292.8995,171.8336,299.55,164.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="261" y="178.4766"/><text fill="#000000" font-fa [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:546px;height:404px;" version="1.1" viewBox="0 0 546 404" width="546px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="225" x="154" y="17.9999">JavaFX [...]
+cluster JavaFX Viewer\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,529,67.1997,529,375.5999,16,375.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="99" x="34" y="43.5998">JavaFX Viewer</text><text fill="#000000" font-family="sans-ser [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="32" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="42" y="210.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="106" y="229.7999">JavaFX</text><text fill="#FFFFFE" font-family="sans-serif" [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="305" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="315" y="315.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="118" x="348.5" y="334.7999">JavaFX (Model)</text><text fill="#FFFFFE" font-family [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="302" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="315" y="210.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="312" y="229.7999">JavaFX (UI Components)</text><text fill="#FFFFFE" font- [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="305" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="315" y="105.5999">Apache Isis Inc - Viewer</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="122" x="346.5" y="124.7999">JavaFX (Viewer)</text><text fill="#FFFFFE" font-family [...]
+link 2 to 3--><path d="M226.12,254.7099 C253.46,265.2999 283.56,276.9699 311.2,287.6699 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="315.97,289.5199,309.0359,282.5257,311.3111,287.7049,306.1319,289.98,315.97,289.5199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="270.5999"/><!--MD5=[d209f2622dd5d3103b9c9b [...]
+link 2 to 4--><path d="M237.18,219.5999 C256.7,219.5999 277.23,219.5999 296.98,219.5999 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="301.99,219.5999,292.99,215.5999,296.99,219.5999,292.99,223.5999,301.99,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="217.5999"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
+link 2 to 5--><path d="M226.12,184.4899 C253.46,173.8999 283.56,162.2299 311.2,151.5299 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="315.97,149.6799,306.1319,149.2197,311.3111,151.4949,309.0359,156.674,315.97,149.6799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="165.5999"/><text fill="#000000" font-fami [...]
 @startuml(id=JavaFX_Viewer)
 title JavaFX Viewer - Containers
 caption Artifact Hierarchy (Maven)
@@ -51,7 +51,7 @@ package "JavaFX Viewer\n[Software System]" {
 2 .[#707070].> 5 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg b/content/core/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg
index 88b2ef9..26c1ec2 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:500px;height:210px;" version="1.1" viewBox="0 0 500 210" width="500px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="192" x="147.5" y="18.9492">REST [...]
-cluster REST Client\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,483,74.7383,483,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="72" x="39.5" y="47.6875">REST Client</text><text fill="#000000" font-family="sans-serif [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="282" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="160" x="292" y="114.293">Apache Isis Ext - REST</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="100" x="324.5" y="135.8867">Client (applib)</text><text fill="#FFFFFE" font-family="s [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="160" x="42" y="114.293">Apache Isis Ext - REST</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="102" x="73.5" y="135.8867">Client (parent)</text><text fill="#FFFFFE" font-family="sans [...]
-link 2 to 3--><path d="M217.14,125.9492 C236.44,125.9492 256.86,125.9492 276.35,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="281.82,125.9492,272.82,121.9492,276.82,125.9492,272.82,129.9492,281.82,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="251" y="122.4766"/><text fill="#000000" font-family=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:528px;height:194px;" version="1.1" viewBox="0 0 528 194" width="528px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="201" x="157" y="17.9999">REST C [...]
+cluster REST Client\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,511,67.1997,511,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="42.5" y="43.5998">REST Client</text><text fill="#000000" font-family="sans-serif [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="199" x="296" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="306" y="105.5999">Apache Isis Ext - REST</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="105" x="343" y="124.7999">Client (applib)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="199" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="42" y="105.5999">Apache Isis Ext - REST</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="107" x="78" y="124.7999">Client (parent)</text><text fill="#FFFFFE" font-family="sans- [...]
+link 2 to 3--><path d="M231.18,114.5999 C250.62,114.5999 271.07,114.5999 290.68,114.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="295.91,114.5999,286.91,110.5999,290.91,114.5999,286.91,118.5999,295.91,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="265" y="112.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=REST_Client)
 title REST Client - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "REST Client\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg b/content/core/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg
index f4fe336..dbb8d1f 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="300px" preserveAspectRatio="none" style="width:509px;height:300px;" version="1.1" viewBox="0 0 509 300" width="509px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="138" x="179" y="18.9492">Root - [...]
-cluster Root\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,492,74.7383,492,270.9492,16,270.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="29" x="61" y="47.6875">Root</text><text fill="#000000" font-family="sans-serif" font-size="14" [...]
-entity 4--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="137" x="326" y="177.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="82" x="353.5" y="204.293">Apache Isis</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="336" y="219.5703">[Container: packaging: pom]</text><!--MD5=[773709cb2207c097691e7e7d3d2cc787]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="44" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="172" x="54" y="114.293">Apache Isis (Aggregator)</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="81.5" y="129.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="313" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="143" x="323" y="114.293">Apache Isis - Antora</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="336" y="129.5703">[Container: packaging: pom]</text><!--MD5=[fad6a9c1e4f80769a7fea8e2093188d9]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="32" y="177.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="42" y="204.293">Apache Isis Supplemental -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="70" x="105" y="225.8867">Legal Info</text><text fill="#FFFFFE" font-family="sans-s [...]
-link 2 to 4--><path d="M218.47,142.5592 C251.09,154.1892 288.83,167.6392 320.9,179.0692 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="326,180.8892,318.8723,174.0925,321.2919,179.2057,316.1787,181.6254,326,180.8892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="162.4766"/><!--MD5=[eeb69082328d10abd3b14fdeede0d8a3]
-link 2 to 3--><path d="M236.1,114.9492 C259.62,114.9492 284.69,114.9492 307.74,114.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="312.93,114.9492,303.93,110.9492,307.93,114.9492,303.93,118.9492,312.93,114.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="111.4766"/><text fill="#000000" font-family="s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="281px" preserveAspectRatio="none" style="width:521px;height:281px;" version="1.1" viewBox="0 0 521 281" width="521px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="141" x="183.5" y="17.9999">Root [...]
+cluster Root\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,504,67.1997,504,252.5999,16,252.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="33" x="67" y="43.5998">Root</text><text fill="#000000" font-family="sans-serif" font-size="14" [...]
+entity 4--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="140" x="331.5" y="166.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="89" x="357" y="192.0999">Apache Isis</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="341.5" y="205.2999">[Container: packaging: pom]</text><!--MD5=[773709cb2207c097691e7e7d3d2cc787]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="209" x="36.5" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="189" x="46.5" y="106.0999">Apache Isis (Aggregator)</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="81" y="119.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="173" x="315" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="325" y="106.0999">Apache Isis - Antora</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="341.5" y="119.2999">[Container: packaging: pom]</text><!--MD5=[fad6a9c1e4f80769a7fea8e2093188d9]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="32" y="166.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="42" y="192.5999">Apache Isis Supplemental</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="85" x="98.5" y="211.7999">- Legal Info</text><text fill="#FFFFFE" font-family="sans [...]
+link 2 to 4--><path d="M218.86,131.1699 C252.9,142.4999 292.78,155.7599 326.49,166.9799 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="331.42,168.6199,324.1528,161.9725,326.678,167.0344,321.6161,169.5597,331.42,168.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="284" y="149.5999"/><!--MD5=[eeb69082328d10abd3b14 [...]
+link 2 to 3--><path d="M245.65,105.5999 C266.76,105.5999 288.81,105.5999 309.44,105.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="314.66,105.5999,305.66,101.5999,309.66,105.5999,305.66,109.5999,314.66,105.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="284" y="103.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=Root)
 title Root - Containers
 caption Artifact Hierarchy (Maven)
@@ -49,7 +49,7 @@ package "Root\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg b/content/core/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg
index 725c173..f2761e1 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:244px;height:210px;" version="1.1" viewBox="0 0 244 210" width="244px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="165" x="33" y="18.9492">Securit [...]
-cluster Security\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,227,74.7383,227,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="49" x="51" y="47.6875">Security</text><text fill="#000000" font-family="sans-serif" font-s [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="179" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="154" x="42" y="114.293">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="45" x="99" y="135.8867">Spring</text><text fill="#FFFFFE" font-family="sans-serif" font [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:254px;height:194px;" version="1.1" viewBox="0 0 254 194" width="254px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="168" x="36.5" y="17.9999">Secur [...]
+cluster Security\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,237,67.1997,237,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="57" x="55" y="43.5998">Security</text><text fill="#000000" font-family="sans-serif" font-s [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="42" y="105.5999">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="51" x="101" y="124.7999">Spring</text><text fill="#FFFFFE" font-family="sans-serif" fo [...]
 @startuml(id=Security)
 title Security - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Security\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg b/content/core/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg
index e798051..3d2788d 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="791px" preserveAspectRatio="none" style="width:517px;height:791px;" version="1.1" viewBox="0 0 517 791" width="517px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="157" x="173.5" y="18.9492">Tool [...]
-cluster Tooling\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,500,74.7383,500,761.9492,16,761.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="44" x="53.5" y="47.6875">Tooling</text><text fill="#000000" font-family="sans-serif" font-s [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="168" x="32" y="400.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="148" x="42" y="427.293">Apache Isis - Tooling</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="57.5" y="442.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="208" x="270.5" y="668.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="183" x="280.5" y="695.293">Apache Isis - Tooling - C4</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="65" x="342" y="716.8867">Modeling</text><text fill="#FFFFFE" font-family="sa [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="210" x="269.5" y="556.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="185" x="279.5" y="583.293">Apache Isis - Tooling - CLI</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="185" x="282" y="604.8867">(Command Line Interface)</text><text fill="#FFFFF [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="219" x="265" y="444.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="275" y="471.293">Apache Isis - Tooling - Java</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="148" x="300.5" y="492.8867">Model (Code Mining)</text><text fill="#FFFFFE" fon [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="219" x="265" y="332.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="275" y="359.293">Apache Isis - Tooling - Java</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="283.5" y="380.8867">to Asciidoc (Code Mining)</text><text fill="#FFFFF [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="183" x="283" y="220.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="293" y="247.293">Apache Isis - Tooling -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="134" x="307.5" y="268.8867">Model for AsciiDoc</text><text fill="#FFFFFE" font-fami [...]
-entity 8--><rect fill="#438DD5" height="98.2773" style="stroke:#2E6295;stroke-width:1.5;" width="183" x="283" y="86.9492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="293" y="113.793">Apache Isis - Tooling -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="145" x="299.5" y="135.3867">Project Model (Code</text><text fill="#FFFFFE" font-fami [...]
-link 2 to 3--><path d="M129.53,455.5492 C151.41,501.1892 200.46,593.1192 265,650.9492 C270.82,656.1592 277.21,661.0392 283.89,665.5592 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="288.08,668.3292,282.7774,660.0297,283.9088,665.5722,278.3662,666.7036,288.08,668.3292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 4--><path d="M150.53,455.6492 C179.8,479.1992 223.91,513.1892 265,538.9492 C273.03,543.9892 281.57,548.9692 290.19,553.7692 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="294.98,556.4092,289.0355,548.5566,290.6032,553.9919,285.1679,555.5596,294.98,556.4092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="23 [...]
-link 2 to 6--><path d="M200.28,445.8092 C219.29,449.8792 239.82,454.2892 259.86,458.5792 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="264.94,459.6692,256.9698,453.8834,260.0495,458.6284,255.3045,461.7081,264.94,459.6692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="234" y="450.4766"/><!--MD5=[4e74f4bf4b09d37138d [...]
-link 2 to 5--><path d="M200.28,409.4392 C219.29,405.2192 239.82,400.6592 259.86,396.1992 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="264.94,395.0692,255.2866,393.1168,260.0591,396.1539,257.022,400.9263,264.94,395.0692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="234" y="399.4766"/><!--MD5=[f03a35d0a29bcf5b4caf [...]
-link 2 to 7--><path d="M149.59,400.3992 C178.8,376.3692 223.34,341.3192 265,314.9492 C272.93,309.9292 281.37,304.9692 289.9,300.1992 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="294.64,297.5692,284.83,298.4434,290.2692,299.9974,288.7152,305.4366,294.64,297.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="234"  [...]
-link 2 to 8--><path d="M130.16,400.2792 C152.76,354.8692 202.63,263.5592 265,202.9492 C270.29,197.8092 276.04,192.8692 282.04,188.1692 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="286.23,184.9592,276.6531,187.2578,282.261,188.0002,281.5187,193.6081,286.23,184.9592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="23 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="759px" preserveAspectRatio="none" style="width:530px;height:759px;" version="1.1" viewBox="0 0 530 759" width="530px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="162" x="177.5" y="17.9999">Tool [...]
+cluster Tooling\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,513,67.1997,513,730.5999,16,730.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="53" x="57" y="43.5998">Tooling</text><text fill="#000000" font-family="sans-serif" font-siz [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="180" x="32" y="387.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="160" x="42" y="413.0999">Apache Isis - Tooling</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="62" y="426.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="278" y="644.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="288" y="670.5999">Apache Isis - Tooling - C4</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="71" x="351.5" y="689.7999">Modeling</text><text fill="#FFFFFE" font-family="san [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="277" y="539.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="200" x="287" y="565.5999">Apache Isis - Tooling - CLI</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="288.5" y="584.7999">(Command Line Interface)</text><text fill="#FFFFFE [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="278" y="434.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="300.5" y="460.5999">Apache Isis - Tooling -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="288" y="479.7999">Java Model (Code Mining)</text><text fill="#FFFFFE" fo [...]
+entity 5--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="199" x="287.5" y="309.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="300.5" y="335.5999">Apache Isis - Tooling -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="297.5" y="354.7999">Java to Asciidoc (Code</text><text fill="#FFFFFE"  [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="193" x="290.5" y="204.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="300.5" y="230.5999">Apache Isis - Tooling -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="144" x="315" y="249.7999">Model for AsciiDoc</text><text fill="#FFFFFE" font-f [...]
+entity 8--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="193" x="290.5" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="300.5" y="105.5999">Apache Isis - Tooling -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="155" x="307.5" y="124.7999">Project Model (Code</text><text fill="#FFFFFE" font [...]
+link 2 to 3--><path d="M135.89,438.1399 C158.98,481.7399 211.17,571.1799 277,626.5999 C283.47,632.0399 290.58,637.0799 297.99,641.7099 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="302.64,644.5399,297.032,636.4435,298.369,641.9401,292.8724,643.2771,302.64,644.5399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="246 [...]
+link 2 to 4--><path d="M155.89,438.2599 C186.37,461.4599 233.45,495.8299 277,521.5999 C286.03,526.9399 295.68,532.2099 305.36,537.2399 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="309.81,539.5299,303.6564,531.84,305.3697,537.2312,299.9786,538.9445,309.81,539.5299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="246 [...]
+link 2 to 6--><path d="M212.04,431.8999 C231.63,436.1399 252.63,440.6899 273.02,445.1099 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="277.91,446.1699,269.956,440.3618,273.0225,445.1154,268.2688,448.1819,277.91,446.1699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="246" y="437.5999"/><!--MD5=[4e74f4bf4b09d37138df [...]
+link 2 to 5--><path d="M212.04,392.9599 C234.58,387.9899 258.98,382.6099 282.18,377.4999 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="287.11,376.4099,277.4609,374.4365,282.2267,377.4839,279.1793,382.2498,287.11,376.4099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="246" y="383.5999"/><!--MD5=[f03a35d0a29bcf5b4ca [...]
+link 2 to 7--><path d="M151.67,386.9099 C181.57,360.8899 230.49,320.4699 277,291.5999 C285.04,286.6099 293.64,281.7599 302.34,277.1599 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="307.18,274.6299,297.3501,275.2401,302.7456,276.9398,301.0459,282.3353,307.18,274.6299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+link 2 to 8--><path d="M135.57,386.7599 C158.53,341.6299 211.03,247.4299 277,186.5999 C282.27,181.7399 287.98,177.1099 293.94,172.7299 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="298.1,169.7299,288.4614,171.7541,294.0459,172.6563,293.1437,178.2407,298.1,169.7299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="246 [...]
 @startuml(id=Tooling)
 title Tooling - Containers
 caption Artifact Hierarchy (Maven)
@@ -78,7 +78,7 @@ package "Tooling\n[Software System]" {
 2 .[#707070].> 8 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg b/content/core/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg
index 06d522d..3e76e9e 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:281px;height:188px;" version="1.1" viewBox="0 0 281 188" width="281px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="142" x="63" y="18.9492">Shiro - [...]
-cluster Shiro\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,264,74.7383,264,158.9492,16,158.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="32" x="59.5" y="47.6875">Shiro</text><text fill="#000000" font-family="sans-serif" font-size= [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="42" y="114.293">Apache Isis Security - Shiro</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="85.5" y="129.5703">[Container: packaging: jar]</text><text fill="#000000" font-family="sans- [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:254px;height:194px;" version="1.1" viewBox="0 0 254 194" width="254px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="145" x="48" y="17.9999">Shiro - [...]
+cluster Shiro\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,237,67.1997,237,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="36" x="65.5" y="43.5998">Shiro</text><text fill="#000000" font-family="sans-serif" font-size= [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="42" y="105.5999">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="41" x="106" y="124.7999">Shiro</text><text fill="#FFFFFE" font-family="sans-serif" fon [...]
 @startuml(id=Shiro)
 title Shiro - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Shiro\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg b/content/core/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg
index e01e85a..0c1dad9 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="546px" preserveAspectRatio="none" style="width:540px;height:546px;" version="1.1" viewBox="0 0 540 546" width="540px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="128" x="199.5" y="18.9492">JPA  [...]
-cluster JPA\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,523,74.7383,523,516.9492,16,516.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="22" x="64.5" y="47.6875">JPA</text><text fill="#000000" font-family="sans-serif" font-size="14" [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="32" y="256.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="42" y="283.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="24" x="122.5" y="304.8867">JPA</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="302" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="312" y="450.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="83" x="363" y="471.8867">JPA (applib)</text><text fill="#FFFFFE" font-family="san [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="302" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="312" y="338.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="115" x="347" y="359.8867">JPA (integration)</text><text fill="#FFFFFE" font-famil [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="302" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="312" y="226.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="345" y="247.8867">JPA (metamodel)</text><text fill="#FFFFFE" font-family= [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="302" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="312" y="114.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="109" x="350" y="135.8867">JPA EclipseLink</text><text fill="#FFFFFE" font-family=" [...]
-link 2 to 3--><path d="M191,333.6492 C223.02,355.5392 264.3,383.0392 302,405.9492 C310.05,410.8392 318.56,415.8192 327.08,420.6892 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="331.81,423.3792,325.9663,415.4513,327.4644,420.9062,322.0095,422.4043,331.81,423.3792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271"  [...]
-link 2 to 5--><path d="M237.2,315.8192 C256.72,319.8292 277.22,324.0292 296.89,328.0692 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="301.87,329.0892,293.8516,323.3704,296.971,328.0894,292.2519,331.2088,301.87,329.0892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="319.4766"/><!--MD5=[8d5e64f07a3a026530162 [...]
-link 2 to 6--><path d="M237.2,273.3192 C256.72,269.1692 277.22,264.8092 296.89,260.6292 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="301.87,259.5692,292.2345,257.5303,296.9795,260.61,293.8998,265.3551,301.87,259.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="263.4766"/><!--MD5=[d209f2622dd5d3103b9c9b [...]
-link 2 to 4--><path d="M189.79,256.2492 C221.93,233.7992 263.73,205.4192 302,181.9492 C309.96,177.0692 318.37,172.1092 326.81,167.2792 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="331.49,164.5992,321.692,165.5984,327.1505,167.083,325.666,172.5416,331.49,164.5992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:562px;height:509px;" version="1.1" viewBox="0 0 562 509" width="562px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="137" x="206" y="17.9999">JPA -  [...]
+cluster JPA\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,545,67.1997,545,480.5999,16,480.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="27" x="70" y="43.5998">JPA</text><text fill="#000000" font-family="sans-serif" font-size="14" f [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="32" y="237.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="42" y="263.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="31" x="124.5" y="282.7999">JPA</text><text fill="#FFFFFE" font-family="sans-serif" [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="420.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="92" x="375" y="439.7999">JPA (applib)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="315.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="357.5" y="334.7999">JPA (integration)</text><text fill="#FFFFFE" font-fa [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="210.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="129" x="356.5" y="229.7999">JPA (metamodel)</text><text fill="#FFFFFE" font-fami [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="105.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="124" x="359" y="124.7999">JPA EclipseLink</text><text fill="#FFFFFE" font-family= [...]
+link 2 to 3--><path d="M196.47,307.7599 C229.83,328.4999 273.38,354.8599 313,376.5999 C322.46,381.7899 332.49,387.0599 342.47,392.1599 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="347.05,394.4899,340.8474,386.8395,342.5951,392.2196,337.215,393.9673,347.05,394.4899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="28 [...]
+link 2 to 5--><path d="M248.07,292.5599 C267.62,296.1999 288.07,300.0099 307.76,303.6799 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="312.75,304.6099,304.6335,299.0312,307.8343,303.6953,303.1702,306.8962,312.75,304.6099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="296.5999"/><!--MD5=[8d5e64f07a3a0265301 [...]
+link 2 to 6--><path d="M248.07,252.2599 C267.62,248.5499 288.07,244.6599 307.76,240.9199 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="312.75,239.9699,303.1638,237.7104,307.8369,240.8982,304.6492,245.5713,312.75,239.9699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="244.5999"/><!--MD5=[d209f2622dd5d3103b9 [...]
+link 2 to 4--><path d="M194.79,237.5299 C228.29,216.1699 272.57,188.8099 313,166.5999 C321.87,161.7299 331.26,156.8199 340.65,152.0599 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="345.26,149.7399,335.4237,150.2374,340.7994,151.9988,339.038,157.3744,345.26,149.7399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="28 [...]
 @startuml(id=JPA)
 title JPA - Containers
 caption Artifact Hierarchy (Maven)
@@ -60,7 +60,7 @@ package "JPA\n[Software System]" {
 2 .[#707070].> 4 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg b/content/core/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg
index 50c0d2a..fd7447d 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="548px" preserveAspectRatio="none" style="width:399px;height:548px;" version="1.1" viewBox="0 0 399 548" width="399px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="177" x="104.5" y="18.9492">Exam [...]
-cluster Examples\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,382,74.7383,382,518.9492,16,518.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="59" x="46" y="47.6875">Examples</text><text fill="#000000" font-family="sans-serif" font-s [...]
-entity 3--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="132" x="234" y="447.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="112" x="244" y="474.293">Demo - Domain</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="245.5" y="489.5703">[Container: packaging: jar]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
-entity 4--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="129" x="235.5" y="357.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="105" x="247.5" y="384.293">Demo - JavaFX</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="245.5" y="399.5703">[Container: packaging: jar]</text><!--MD5=[773709cb2207c097691e7e7d3d2cc787]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="137" x="32" y="267.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="103" x="49" y="294.293">Demo - Parent</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="42" y="309.5703">[Container: packaging: pom]</text><!--MD5=[fad6a9c1e4f80769a7fea8e2093188d9]
-entity 5--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="129" x="235.5" y="267.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="106" x="247" y="294.293">Demo - Vaadin</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="245.5" y="309.5703">[Container: packaging: jar]</text><!--MD5=[a92bd7649e35c8a5fd4b3e9f57d24e4a]
-entity 6--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="129" x="235.5" y="177.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="88" x="256" y="204.293">Demo - Web</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="245.5" y="219.5703">[Container: packaging: jar]</text><!--MD5=[cbb381f34bde73e199f6c8e56df9562c]
-entity 7--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="129" x="235.5" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="104" x="248" y="114.293">Demo - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="245.5" y="129.5703">[Container: packaging: jar]</text><!--MD5=[eeb69082328d10abd3b14fdeede0d8a3]
-link 2 to 3--><path d="M125.75,322.5892 C151.32,350.9892 193.44,395.7792 234,429.9492 C239.71,434.7592 245.94,439.5692 252.19,444.1392 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="256.53,447.2692,251.5879,438.7501,252.4808,444.336,246.8948,445.2289,256.53,447.2692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="20 [...]
-link 2 to 4--><path d="M162.1,322.5592 C184.85,332.9292 210.79,344.7492 233.93,355.2992 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="238.52,357.3892,231.9819,350.0235,233.9682,355.3202,228.6715,357.3065,238.52,357.3892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="203" y="336.4766"/><!--MD5=[4e74f4bf4b09d37138df [...]
-link 2 to 5--><path d="M169.19,294.9492 C188.87,294.9492 210.39,294.9492 230.14,294.9492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="235.39,294.9492,226.39,290.9492,230.39,294.9492,226.39,298.9492,235.39,294.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="203" y="291.4766"/><!--MD5=[8d5e64f07a3a026530162c78b [...]
-link 2 to 6--><path d="M162.1,267.3392 C184.85,256.9692 210.79,245.1492 233.93,234.5992 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="238.52,232.5092,228.6715,232.592,233.9682,234.5782,231.9819,239.8749,238.52,232.5092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="203" y="246.4766"/><!--MD5=[f03a35d0a29bcf5b4caf4 [...]
-link 2 to 7--><path d="M125.75,267.3092 C151.32,238.9092 193.44,194.1192 234,159.9492 C239.71,155.1392 245.94,150.3292 252.19,145.7592 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="256.53,142.6292,246.8948,144.6696,252.4808,145.5624,251.5879,151.1484,256.53,142.6292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="520px" preserveAspectRatio="none" style="width:407px;height:520px;" version="1.1" viewBox="0 0 407 520" width="407px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="181" x="106.5" y="17.9999">Exam [...]
+cluster Examples\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,390,67.1997,390,491.5999,16,491.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="67" x="50" y="43.5998">Examples</text><text fill="#000000" font-family="sans-serif" font-s [...]
+entity 3--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="137" x="237" y="424.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="117" x="247" y="450.0999">Demo - Domain</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="250" y="463.2999">[Container: packaging: jar]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
+entity 4--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="135" x="238" y="338.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="115" x="248" y="364.0999">Demo - JavaFX</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="250" y="377.2999">[Container: packaging: jar]</text><!--MD5=[773709cb2207c097691e7e7d3d2cc787]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="140" x="32" y="252.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="108" x="48" y="278.0999">Demo - Parent</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="42" y="291.2999">[Container: packaging: pom]</text><!--MD5=[fad6a9c1e4f80769a7fea8e2093188d9]
+entity 5--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="131" x="240" y="252.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="111" x="250" y="278.0999">Demo - Vaadin</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="250" y="291.2999">[Container: packaging: jar]</text><!--MD5=[a92bd7649e35c8a5fd4b3e9f57d24e4a]
+entity 6--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="131" x="240" y="166.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="92" x="259.5" y="192.0999">Demo - Web</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="250" y="205.2999">[Container: packaging: jar]</text><!--MD5=[cbb381f34bde73e199f6c8e56df9562c]
+entity 7--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="131" x="240" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="109" x="251" y="106.0999">Demo - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="250" y="119.2999">[Container: packaging: jar]</text><!--MD5=[eeb69082328d10abd3b14fdeede0d8a3]
+link 2 to 3--><path d="M126.59,303.1699 C152.36,330.3799 195.51,373.9499 237,406.5999 C243.33,411.5799 250.25,416.5099 257.18,421.1599 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="261.48,424.0099,256.1774,415.7103,257.3088,421.2529,251.7662,422.3842,261.48,424.0099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+link 2 to 4--><path d="M162.91,303.1699 C187.06,313.4699 214.97,325.3899 239.59,335.8999 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="244.47,337.9799,237.7544,330.7756,239.8691,336.0223,234.6224,338.137,244.47,337.9799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" y="318.5999"/><!--MD5=[4e74f4bf4b09d37138df [...]
+link 2 to 5--><path d="M172.06,277.5999 C192.33,277.5999 214.51,277.5999 234.82,277.5999 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="239.94,277.5999,230.94,273.5999,234.94,277.5999,230.94,281.5999,239.94,277.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" y="275.5999"/><!--MD5=[8d5e64f07a3a026530162c78b [...]
+link 2 to 6--><path d="M162.91,252.0299 C187.06,241.7299 214.97,229.8099 239.59,219.2999 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="244.47,217.2199,234.6224,217.0627,239.8691,219.1774,237.7544,224.4241,244.47,217.2199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" y="232.5999"/><!--MD5=[f03a35d0a29bcf5b4ca [...]
+link 2 to 7--><path d="M126.59,252.0299 C152.36,224.8199 195.51,181.2499 237,148.5999 C243.33,143.6199 250.25,138.6899 257.18,134.0399 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="261.48,131.1899,251.7662,132.8155,257.3088,133.9469,256.1774,139.4894,261.48,131.1899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
 @startuml(id=Examples)
 title Examples - Containers
 caption Artifact Hierarchy (Maven)
@@ -69,7 +69,7 @@ package "Examples\n[Software System]" {
 2 .[#707070].> 7 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg b/content/core/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg
index 7892363..95a380f 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:244px;height:210px;" version="1.1" viewBox="0 0 244 210" width="244px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="158" x="36.5" y="18.9492">Bypas [...]
-cluster Bypass\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,227,74.7383,227,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="45" x="53" y="47.6875">Bypass</text><text fill="#000000" font-family="sans-serif" font-size= [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="179" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="154" x="42" y="114.293">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="51" x="96" y="135.8867">Bypass</text><text fill="#FFFFFE" font-family="sans-serif" font [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:254px;height:194px;" version="1.1" viewBox="0 0 254 194" width="254px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="162" x="39.5" y="17.9999">Bypas [...]
+cluster Bypass\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,237,67.1997,237,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="58" y="43.5998">Bypass</text><text fill="#000000" font-family="sans-serif" font-size= [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="42" y="105.5999">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="98" y="124.7999">Bypass</text><text fill="#FFFFFE" font-family="sans-serif" fon [...]
 @startuml(id=Bypass)
 title Bypass - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Bypass\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg b/content/core/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg
index 92b4762..33c2e0e 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:239px;height:188px;" version="1.1" viewBox="0 0 239 188" width="239px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="177" x="24.5" y="18.9492">Incub [...]
-cluster Incubator\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,222,74.7383,222,158.9492,16,158.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="59" x="46" y="47.6875">Incubator</text><text fill="#000000" font-family="sans-serif" font [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="174" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="154" x="42" y="114.293">Apache Isis Incubator</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="60.5" y="129.5703">[Container: packaging: pom]</text><text fill="#000000" font-family="sans-serif"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="176px" preserveAspectRatio="none" style="width:252px;height:176px;" version="1.1" viewBox="0 0 252 176" width="252px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="178" x="30.5" y="17.9999">Incub [...]
+cluster Incubator\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,235,67.1997,235,147.5999,16,147.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="66" x="50.5" y="43.5998">Incubator</text><text fill="#000000" font-family="sans-serif" fo [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="187" x="32" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="42" y="106.0999">Apache Isis Incubator</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="65.5" y="119.2999">[Container: packaging: pom]</text><text fill="#000000" font-family="sans-serif" fo [...]
 @startuml(id=Incubator)
 title Incubator - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Incubator\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg b/content/core/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg
index ff8aa6b..1060102 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:513px;height:210px;" version="1.1" viewBox="0 0 513 210" width="513px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="200" x="150" y="18.9492">Core:  [...]
-cluster Core: Quartz\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,496,74.7383,496,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="76" x="37.5" y="47.6875">Core: Quartz</text><text fill="#000000" font-family="sans-ser [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="98.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="42" y="125.293">Apache Isis Ext - Quartz</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="68" y="140.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="286" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="296" y="114.293">Apache Isis Ext - Quartz</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="30" x="368" y="135.8867">Impl</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
-link 2 to 3--><path d="M221.18,125.9492 C240.57,125.9492 261.07,125.9492 280.72,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="285.96,125.9492,276.96,121.9492,280.96,125.9492,276.96,129.9492,285.96,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="255" y="122.4766"/><text fill="#000000" font-family=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:538px;height:194px;" version="1.1" viewBox="0 0 538 194" width="538px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="206" x="159.5" y="17.9999">Core [...]
+cluster Core: Quartz\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,521,67.1997,521,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="84" x="41.5" y="43.5998">Core: Quartz</text><text fill="#000000" font-family="sans-ser [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="202" x="32" y="89.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="42" y="115.0999">Apache Isis Ext - Quartz</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="73" y="128.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="299" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="309" y="105.5999">Apache Isis Ext - Quartz</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="33" x="385.5" y="124.7999">Impl</text><text fill="#FFFFFE" font-family="sans-serif [...]
+link 2 to 3--><path d="M234.18,114.5999 C253.6,114.5999 274.03,114.5999 293.68,114.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="298.92,114.5999,289.92,110.5999,293.92,114.5999,289.92,118.5999,298.92,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="268" y="112.5999"/><text fill="#000000" font-family="s [...]
 @startuml(id=Core:_Quartz)
 title Core: Quartz - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "Core: Quartz\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg b/content/core/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg
index 8a8e83b..43da818 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="636px" preserveAspectRatio="none" style="width:501px;height:636px;" version="1.1" viewBox="0 0 501 636" width="501px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="156" x="166" y="18.9492">Legacy [...]
-cluster Legacy\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,484,74.7383,484,606.9492,16,606.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="43" x="54" y="47.6875">Legacy</text><text fill="#000000" font-family="sans-serif" font-size= [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="156" x="32" y="322.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="136" x="42" y="349.293">Apache Isis Legacy</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="51.5" y="364.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="215" x="253" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="195" x="263" y="562.293">Apache Isis Legacy - Applib</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="306" y="577.5703">[Container: packaging: jar]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="171" x="275" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="146" x="285" y="450.293">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="71" x="325" y="471.8867">Commons</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="171" x="275" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="146" x="285" y="338.293">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="80" x="320.5" y="359.8867">Metamodel</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="213" x="254" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="188" x="264" y="226.293">Apache Isis Legacy - REST</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="41" x="340" y="247.8867">Client</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="171" x="275" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="146" x="285" y="114.293">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="331" y="135.8867">Runtime</text><text fill="#FFFFFE" font-family="sans-serif" fo [...]
-link 2 to 3--><path d="M128.28,377.5492 C152.31,414.0092 199.02,478.2192 253,517.9492 C260.5,523.4692 268.78,528.4692 277.32,532.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="282.08,535.3892,275.8969,527.7231,277.6309,533.1076,272.2464,534.8416,282.08,535.3892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="22 [...]
-link 2 to 4--><path d="M172.11,377.4892 C201.56,390.7592 237.45,406.9392 269.91,421.5692 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.68,423.7192,268.1228,416.3706,270.1228,421.6621,264.8313,423.6621,274.68,423.7192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="222" y="396.4766"/><!--MD5=[4e74f4bf4b09d37138d [...]
-link 2 to 5--><path d="M188.26,349.9492 C214.04,349.9492 242.99,349.9492 269.64,349.9492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.94,349.9492,265.94,345.9492,269.94,349.9492,265.94,353.9492,274.94,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="222" y="346.4766"/><!--MD5=[8d5e64f07a3a026530162c78b [...]
-link 2 to 6--><path d="M172.11,322.4092 C201.28,309.2592 236.78,293.2592 269.01,278.7392 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="273.74,276.5992,263.8913,276.6564,269.1828,278.6564,267.1828,283.9479,273.74,276.5992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="222" y="297.4766"/><!--MD5=[f03a35d0a29bcf5b4ca [...]
-link 2 to 7--><path d="M129.21,322.3992 C153.94,286.5792 201.04,223.6792 253,181.9492 C259.41,176.7992 266.36,171.9192 273.54,167.3292 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="278.04,164.5192,268.2914,165.9209,273.8064,167.1795,272.5478,172.6945,278.04,164.5192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="614px" preserveAspectRatio="none" style="width:481px;height:614px;" version="1.1" viewBox="0 0 481 614" width="481px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="161" x="153.5" y="17.9999">Lega [...]
+cluster Legacy\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,464,67.1997,464,585.5999,16,585.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="58.5" y="43.5998">Legacy</text><text fill="#000000" font-family="sans-serif" font-siz [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="169" x="32" y="299.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="149" x="42" y="325.0999">Apache Isis Legacy</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="56.5" y="338.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="182" x="266" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="276" y="525.5999">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="49" x="332.5" y="544.7999">Applib</text><text fill="#FFFFFE" font-family="sans-serif" [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="182" x="266" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="276" y="420.5999">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="79" x="317.5" y="439.7999">Commons</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="182" x="266" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="276" y="315.5999">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="84" x="315" y="334.7999">Metamodel</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="182" x="266" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="276" y="210.5999">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="92" x="311" y="229.7999">REST Client</text><text fill="#FFFFFE" font-family="sans-ser [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="182" x="266" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="276" y="105.5999">Apache Isis Legacy -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="64" x="325" y="124.7999">Runtime</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
+link 2 to 3--><path d="M137.96,350.3699 C164.98,383.3399 215.09,441.0399 266,481.5999 C272.46,486.7499 279.47,491.7399 286.63,496.4699 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="291.1,499.3799,285.7449,491.1141,286.9114,496.6494,281.3761,497.8159,291.1,499.3799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="235 [...]
+link 2 to 4--><path d="M175.54,350.1499 C204.45,362.8799 239.95,378.5099 271.79,392.5299 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="276.46,394.5799,269.8369,387.2905,271.8845,392.5638,266.6112,394.6113,276.46,394.5799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="235" y="373.5999"/><!--MD5=[4e74f4bf4b09d37138d [...]
+link 2 to 5--><path d="M201.25,324.5999 C220.47,324.5999 241.05,324.5999 260.71,324.5999 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="265.96,324.5999,256.96,320.5999,260.96,324.5999,256.96,328.5999,265.96,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="235" y="322.5999"/><!--MD5=[8d5e64f07a3a026530162c78b [...]
+link 2 to 6--><path d="M175.54,299.0499 C204.45,286.3199 239.95,270.6899 271.79,256.6699 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="276.46,254.6199,266.6112,254.5884,271.8845,256.636,269.8369,261.9092,276.46,254.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="235" y="272.5999"/><!--MD5=[f03a35d0a29bcf5b4caf [...]
+link 2 to 7--><path d="M137.65,298.8699 C164.51,265.6499 214.66,207.2799 266,166.5999 C272.21,161.6799 278.93,156.9199 285.81,152.4099 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="290.12,149.6299,280.3864,151.132,285.9141,152.3337,284.7124,157.8614,290.12,149.6299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="23 [...]
 @startuml(id=Legacy)
 title Legacy - Containers
 caption Artifact Hierarchy (Maven)
@@ -69,7 +69,7 @@ package "Legacy\n[Software System]" {
 2 .[#707070].> 7 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg b/content/core/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg
index 2b6c854..250a45d 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1106px" preserveAspectRatio="none" style="width:789px;height:1106px;" version="1.1" viewBox="0 0 789 1106" width="789px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="158" x="309" y="18.9492">Tes [...]
-cluster Testing\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,772,74.7383,772,1076.9492,16,1076.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="44" x="53.5" y="47.6875">Testing</text><text fill="#000000" font-family="sans-serif" font [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="158" x="32" y="434.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="138" x="42" y="461.293">Apache Isis Testing</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="52.5" y="476.5703">[Container: packaging: pom]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="539" y="983.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="549" y="1010.293">Apache Isis Tst - FakeData</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="620" y="1031.8867">(applib)</text><text fill="#FFFFFE" font-family="sans [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="539" y="871.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="549" y="898.293">Apache Isis Tst - FakeData</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="62" x="616" y="919.8867">(fixtures)</text><text fill="#FFFFFE" font-family="sans [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="539" y="759.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="549" y="786.293">Apache Isis Tst - FakeData</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="85" x="604.5" y="807.8867">(integ tests)</text><text fill="#FFFFFE" font-family= [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="256" y="822.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="266" y="849.293">Apache Isis Tst - FakeData</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="336" y="870.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="545.5" y="647.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="178" x="555.5" y="674.293">Apache Isis Tst - Fixtures</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="620" y="695.8867">(applib)</text><text fill="#FFFFFE" font-family="sa [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="262.5" y="647.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="178" x="272.5" y="674.293">Apache Isis Tst - Fixtures</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="336" y="695.8867">(parent)</text><text fill="#FFFFFE" font-family="sa [...]
-entity 9--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="169" x="279.5" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="144" x="289.5" y="562.293">Apache Isis Tst - H2</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="304.5" y="583.8867">Console (parent)</text><text fill="#FFFFFE" font-famil [...]
-entity 10--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="169" x="562.5" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="144" x="572.5" y="562.293">Apache Isis Tst - H2</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="86" x="604" y="583.8867">Console (ui)</text><text fill="#FFFFFE" font-family="san [...]
-entity 12--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="209" x="542.5" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="552.5" y="450.293">Apache Isis Tst - HSQLDB</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="62" x="616" y="471.8867">Manager</text><text fill="#FFFFFE" font-family="sans [...]
-entity 11--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="209" x="259.5" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="269.5" y="450.293">Apache Isis Tst - HSQLDB</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="123" x="302.5" y="471.8867">Manager (parent)</text><text fill="#FFFFFE" font- [...]
-entity 14--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="538" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="193" x="548" y="338.293">Apache Isis Tst - Integ Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="115" x="589.5" y="359.8867">Support (applib)</text><text fill="#FFFFFE" font- [...]
-entity 13--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="255" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="193" x="265" y="338.293">Apache Isis Tst - Integ Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="117" x="305.5" y="359.8867">Support (parent)</text><text fill="#FFFFFE" font- [...]
-entity 16--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="549.5" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="118" x="585.5" y="226.293">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="559.5" y="247.8867">Spec/Cucumber (applib)</text><text fill="#FFFFFE" font-f [...]
-entity 15--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="197" x="265.5" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="118" x="302.5" y="226.293">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="177" x="275.5" y="247.8867">Spec/Cucumber (parent)</text><text fill="#FFFFFE" font-f [...]
-entity 18--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="541.5" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="551.5" y="114.293">Apache Isis Tst - Unit Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="115" x="589.5" y="135.8867">Support (applib)</text><text fill="#FFFFFE" fon [...]
-entity 17--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="258.5" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="268.5" y="114.293">Apache Isis Tst - Unit Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="117" x="305.5" y="135.8867">Support (parent)</text><text fill="#FFFFFE" fon [...]
-link 2 to 3--><path d="M123.17,489.5292 C144.78,541.3392 195.43,655.7292 255,741.9492 C273.89,769.2892 298.58,796.9492 319.59,818.7092 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="323.19,822.4292,319.8032,813.181,319.7119,818.8371,314.0558,818.7459,323.19,822.4292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="22 [...]
-link 2 to 7--><path d="M130.35,489.5392 C155.25,525.3992 202.69,588.3392 255,629.9492 C261.5,635.1192 268.56,640.0292 275.84,644.6192 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="280.4,647.4492,274.8559,639.309,276.1496,644.816,270.6427,646.1097,280.4,647.4492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="224" y [...]
-link 2 to 9--><path d="M173.72,489.4892 C204.02,503.0092 241.07,519.5492 274.34,534.3892 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="279.22,536.5692,272.6351,529.2454,274.6551,534.5293,269.3712,536.5492,279.22,536.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="224" y="508.4766"/><!--MD5=[350ab8b289b532334af [...]
-link 2 to 11--><path d="M190.04,461.9492 C210.29,461.9492 232.48,461.9492 254,461.9492 " fill="none" id="2-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="259.16,461.9492,250.16,457.9492,254.16,461.9492,250.16,465.9492,259.16,461.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="224" y="458.4766"/><!--MD5=[78aff816aa8a90b4ab29aa1634b5681f]
-link 2 to 13--><path d="M173.72,434.4092 C203.19,421.2592 239.05,405.2592 271.6,390.7392 " fill="none" id="2-to-13" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="276.37,388.5992,266.5212,388.6192,271.8051,390.6392,269.7851,395.9231,276.37,388.5992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="224" y="409.4766"/><!--MD5=[62213bd213e9eab9cc [...]
-link 2 to 15--><path d="M130.35,434.3592 C155.25,398.4992 202.69,335.5592 255,293.9492 C261.5,288.7792 268.56,283.8692 275.84,279.2792 " fill="none" id="2-to-15" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="280.4,276.4492,270.6427,277.7887,276.1496,279.0825,274.8559,284.5894,280.4,276.4492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="22 [...]
-link 2 to 17--><path d="M119.84,434.2692 C136.5,379.7592 180.16,257.2492 255,181.9492 C260.14,176.7792 265.86,171.9792 271.91,167.5492 " fill="none" id="2-to-17" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="276.14,164.5492,266.4856,166.4966,272.0627,167.4433,271.1161,173.0203,276.14,164.5492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x=" [...]
-link 3 to 4--><path d="M426.46,899.6292 C459.25,919.9192 500.48,944.8692 538,965.9492 C546.86,970.9292 556.21,976.0192 565.54,980.9892 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="570.12,983.4292,564.0455,975.6768,565.7035,981.0852,560.2951,982.7432,570.12,983.4292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="5 [...]
-link 3 to 5--><path d="M472.04,879.6092 C492.2,883.1292 513.33,886.8192 533.65,890.3592 " fill="none" id="3-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="538.8,891.2592,530.6185,885.7763,533.8739,890.4025,529.2477,893.658,538.8,891.2592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="882.4766"/><!--MD5=[b2ac855d378984b70ee6a5b [...]
-link 3 to 6--><path d="M472.04,836.9492 C492.28,832.4092 513.51,827.6492 533.91,823.0792 " fill="none" id="3-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="538.8,821.9792,529.1412,820.0537,533.9221,823.0775,530.8984,827.8584,538.8,821.9792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="826.4766"/><!--MD5=[5ca979b543d038a4b12f0 [...]
-link 7 to 8--><path d="M465.65,685.9492 C489.77,685.9492 515.58,685.9492 539.93,685.9492 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="545.1,685.9492,536.1,681.9492,540.1,685.9492,536.1,689.9492,545.1,685.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="682.4766"/><!--MD5=[d626a4137f042c9ed96693ba98ea08de]
-link 9 to 10--><path d="M448.55,573.9492 C482.78,573.9492 522.44,573.9492 557.2,573.9492 " fill="none" id="9-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="562.29,573.9492,553.29,569.9492,557.29,573.9492,553.29,577.9492,562.29,573.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="570.4766"/><!--MD5=[0a5a2d32bb972d30673e2f26 [...]
-link 11 to 12--><path d="M468.84,461.9492 C491.07,461.9492 514.63,461.9492 537.05,461.9492 " fill="none" id="11-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="542.12,461.9492,533.12,457.9492,537.12,461.9492,533.12,465.9492,542.12,461.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="458.4766"/><!--MD5=[26c085f55605f16ba3099 [...]
-link 13 to 14--><path d="M473.24,349.9492 C492.68,349.9492 513,349.9492 532.58,349.9492 " fill="none" id="13-to-14" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="537.82,349.9492,528.82,345.9492,532.82,349.9492,528.82,353.9492,537.82,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="346.4766"/><!--MD5=[4dca66fb0d9cfb8b0ca9b77e [...]
-link 15 to 16--><path d="M462.89,237.9492 C489.17,237.9492 517.65,237.9492 544.14,237.9492 " fill="none" id="15-to-16" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="549.41,237.9492,540.41,233.9492,544.41,237.9492,540.41,241.9492,549.41,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="234.4766"/><!--MD5=[f563b88519aec37ca9b20 [...]
-link 17 to 18--><path d="M469.63,125.9492 C491.3,125.9492 514.19,125.9492 536.04,125.9492 " fill="none" id="17-to-18" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="541.28,125.9492,532.28,121.9492,536.28,125.9492,532.28,129.9492,541.28,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="507" y="122.4766"/><text fill="#000000" font-famil [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1034px" preserveAspectRatio="none" style="width:803px;height:1034px;" version="1.1" viewBox="0 0 803 1034" width="803px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="162" x="314" y="17.9999">Tes [...]
+cluster Testing\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,786,67.1997,786,1005.5999,16,1005.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="52" x="57.5" y="43.5998">Testing</text><text fill="#000000" font-family="sans-serif" font [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="170" x="32" y="404.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="150" x="42" y="430.0999">Apache Isis Testing</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="57" y="443.2999">[Container: packaging: pom]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="153" x="584" y="919.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="595.5" y="945.5999">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="133" x="594" y="964.7999">FakeData (applib)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="579" y="814.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="595.5" y="840.5999">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="143" x="589" y="859.7999">FakeData (fixtures)</text><text fill="#FFFFFE" font-family=" [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="185" x="568" y="709.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="595.5" y="735.5999">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="578" y="754.7999">FakeData (integ tests)</text><text fill="#FFFFFE" font-famil [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="155" x="299" y="755.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="311.5" y="781.5999">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="135" x="309" y="800.7999">FakeData (parent)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="552.5" y="604.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="562.5" y="630.5999">Apache Isis Tst - Fixtures</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="632" y="649.7999">(applib)</text><text fill="#FFFFFE" font-family="s [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="268.5" y="604.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="278.5" y="630.5999">Apache Isis Tst - Fixtures</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="347" y="649.7999">(parent)</text><text fill="#FFFFFE" font-family="s [...]
+entity 9--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="175" x="289" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="151" x="299" y="525.5999">Apache Isis Tst - H2</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="127" x="313" y="544.7999">Console (parent)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 10--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="175" x="573" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="151" x="583" y="525.5999">Apache Isis Tst - H2</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="92" x="614.5" y="544.7999">Console (ui)</text><text fill="#FFFFFE" font-family="sans [...]
+entity 12--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="219" x="551" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="199" x="561" y="420.5999">Apache Isis Tst - HSQLDB</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="67" x="627" y="439.7999">Manager</text><text fill="#FFFFFE" font-family="sans-se [...]
+entity 11--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="219" x="267" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="199" x="277" y="420.5999">Apache Isis Tst - HSQLDB</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="311.5" y="439.7999">Manager (parent)</text><text fill="#FFFFFE" font-fam [...]
+entity 14--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="193" x="564" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="574" y="315.5999">Apache Isis Tst - Integ</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="160" x="580.5" y="334.7999">Test Support (applib)</text><text fill="#FFFFFE" font [...]
+entity 13--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="193" x="280" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="290" y="315.5999">Apache Isis Tst - Integ</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="162" x="295.5" y="334.7999">Test Support (parent)</text><text fill="#FFFFFE" font [...]
+entity 16--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="204" x="558.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="595.5" y="210.5999">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="568.5" y="229.7999">Spec/Cucumber (applib)</text><text fill="#FFFFFE" font- [...]
+entity 15--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="273.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="311.5" y="210.5999">Apache Isis Tst -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="283.5" y="229.7999">Spec/Cucumber (parent)</text><text fill="#FFFFFE" font- [...]
+entity 18--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="551.5" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="561.5" y="105.5999">Apache Isis Tst - Unit Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="123" x="599" y="124.7999">Support (applib)</text><text fill="#FFFFFE" font [...]
+entity 17--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="267.5" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="277.5" y="105.5999">Apache Isis Tst - Unit Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="125" x="314" y="124.7999">Support (parent)</text><text fill="#FFFFFE" font [...]
+link 2 to 3--><path d="M129.35,455.4399 C151.56,504.4199 204.12,612.8999 267,691.5999 C284.53,713.5499 307.07,734.9299 327.05,752.1799 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="331.01,755.5799,326.7771,746.687,327.2127,752.3271,321.5726,752.7627,331.01,755.5799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="23 [...]
+link 2 to 7--><path d="M137.39,455.1199 C163.82,488.6199 213.98,547.6999 267,586.5999 C274.42,592.0399 282.48,597.1699 290.74,601.9399 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="295.36,604.5599,289.5163,596.632,291.0144,602.0869,285.5595,603.585,295.36,604.5599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="236 [...]
+link 2 to 9--><path d="M180.66,455.1499 C211.88,467.8799 250.21,483.5099 284.58,497.5299 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="289.62,499.5799,282.8055,492.4692,284.9925,497.6861,279.7755,499.8732,289.62,499.5799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="236" y="475.5999"/><!--MD5=[350ab8b289b532334af [...]
+link 2 to 11--><path d="M202.32,429.5999 C221.25,429.5999 241.64,429.5999 261.55,429.5999 " fill="none" id="2-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="266.6,429.5999,257.6,425.5999,261.6,429.5999,257.6,433.5999,266.6,429.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="236" y="427.5999"/><!--MD5=[78aff816aa8a90b4ab29aa1634b5681f]
+link 2 to 13--><path d="M180.66,404.0499 C211.88,391.3199 250.21,375.6899 284.58,361.6699 " fill="none" id="2-to-13" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="289.62,359.6199,279.7755,359.3266,284.9925,361.5136,282.8055,366.7306,289.62,359.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="236" y="380.5999"/><!--MD5=[62213bd213e9eab9c [...]
+link 2 to 15--><path d="M137.31,403.8399 C163.65,370.0599 213.72,310.5199 267,271.5999 C274.05,266.4499 281.68,261.5999 289.52,257.0899 " fill="none" id="2-to-15" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="293.9,254.6199,284.0958,255.5566,289.5448,257.0759,288.0255,262.5249,293.9,254.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+link 2 to 17--><path d="M126.61,403.8099 C144.9,352.4799 192.2,236.4399 267,166.5999 C272.46,161.4999 278.51,156.8199 284.88,152.5199 " fill="none" id="2-to-17" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="289.33,149.6099,279.6061,151.1738,285.1414,152.3403,283.9749,157.8756,289.33,149.6099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+link 3 to 4--><path d="M428.93,825.7099 C462.96,848.3799 508.91,877.9599 551,901.5999 C560.35,906.8499 570.3,912.1199 580.23,917.1899 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="584.79,919.5099,578.5581,911.8833,580.3265,917.2567,574.9531,919.025,584.79,919.5099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520 [...]
+link 3 to 5--><path d="M454.19,806.6399 C491.18,814.3799 535.69,823.6999 573.8,831.6699 " fill="none" id="3-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="578.89,832.7299,570.891,826.984,573.9944,831.7135,569.2648,834.8169,578.89,832.7299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="818.5999"/><!--MD5=[b2ac855d378984b70ee6a5 [...]
+link 3 to 6--><path d="M454.19,778.0899 C487.61,772.6399 527.17,766.1899 562.59,760.4099 " fill="none" id="3-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="567.79,759.5599,558.2583,757.0804,562.8569,760.3749,559.5624,764.9734,567.79,759.5599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="765.5999"/><!--MD5=[5ca979b543d038a4b12 [...]
+link 7 to 8--><path d="M484.51,639.5999 C504.91,639.5999 526.32,639.5999 546.88,639.5999 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="552.09,639.5999,543.09,635.5999,547.09,639.5999,543.09,643.5999,552.09,639.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="637.5999"/><!--MD5=[d626a4137f042c9ed96693ba9 [...]
+link 9 to 10--><path d="M464.03,534.5999 C496.76,534.5999 534.12,534.5999 567.36,534.5999 " fill="none" id="9-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="572.65,534.5999,563.65,530.5999,567.65,534.5999,563.65,538.5999,572.65,534.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="532.5999"/><!--MD5=[0a5a2d32bb972d30673e2f2 [...]
+link 11 to 12--><path d="M486.13,429.5999 C505.64,429.5999 526.03,429.5999 545.68,429.5999 " fill="none" id="11-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="550.93,429.5999,541.93,425.5999,545.93,429.5999,541.93,433.5999,550.93,429.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="427.5999"/><!--MD5=[26c085f55605f16ba3099 [...]
+link 13 to 14--><path d="M473.37,324.5999 C500.87,324.5999 530.94,324.5999 558.74,324.5999 " fill="none" id="13-to-14" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="563.9,324.5999,554.9,320.5999,558.9,324.5999,554.9,328.5999,563.9,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="322.5999"/><!--MD5=[4dca66fb0d9cfb8b0ca9b77e0e08f996]
+link 15 to 16--><path d="M479.71,219.5999 C503.55,219.5999 528.99,219.5999 553.01,219.5999 " fill="none" id="15-to-16" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="558.11,219.5999,549.11,215.5999,553.11,219.5999,549.11,223.5999,558.11,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="217.5999"/><!--MD5=[f563b88519aec37ca9b20 [...]
+link 17 to 18--><path d="M485.72,114.5999 C505.48,114.5999 526.15,114.5999 546.06,114.5999 " fill="none" id="17-to-18" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="551.1,114.5999,542.1,110.5999,546.1,114.5999,542.1,118.5999,551.1,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="520" y="112.5999"/><text fill="#000000" font-family="s [...]
 @startuml(id=Testing)
 title Testing - Containers
 caption Artifact Hierarchy (Maven)
@@ -168,7 +168,7 @@ package "Testing\n[Software System]" {
 17 .[#707070].> 18 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg b/content/core/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg
index 4f88fcd..c8cb21c 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:271px;height:188px;" version="1.1" viewBox="0 0 271 188" width="271px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="131" x="63.5" y="18.9492">App - [...]
-cluster App\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,254,74.7383,254,158.9492,16,158.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="24" x="63.5" y="47.6875">App</text><text fill="#000000" font-family="sans-serif" font-size="14" [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="42" y="114.293">Apache Isis Starter Parent</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="76.5" y="129.5703">[Container: packaging: pom]</text><text fill="#000000" font-family="sans-se [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="176px" preserveAspectRatio="none" style="width:283px;height:176px;" version="1.1" viewBox="0 0 283 176" width="283px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="135" x="67.5" y="17.9999">App - [...]
+cluster App\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,266,67.1997,266,147.5999,16,147.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="28" x="69.5" y="43.5998">App</text><text fill="#000000" font-family="sans-serif" font-size="14" [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="32" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="42" y="106.0999">Apache Isis Starter Parent</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="81" y="119.2999">[Container: packaging: pom]</text><text fill="#000000" font-family="sans-serif" [...]
 @startuml(id=App)
 title App - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "App\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg b/content/core/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg
index 591336d..ea4d7ee 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:454px;height:210px;" version="1.1" viewBox="0 0 454 210" width="454px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="195" x="123" y="18.9492">XDocRe [...]
-cluster XDocReport\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,437,74.7383,437,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="73" x="39" y="47.6875">XDocReport</text><text fill="#000000" font-family="sans-serif" fo [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="161" x="260" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="125" x="275.5" y="114.293">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="141" x="270" y="135.8867">XdocReport (applib)</text><text fill="#FFFFFE" font-family="sa [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="125" x="48.5" y="114.293">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="143" x="42" y="135.8867">XdocReport (parent)</text><text fill="#FFFFFE" font-family="sans- [...]
-link 2 to 3--><path d="M195.09,125.9492 C214.34,125.9492 234.95,125.9492 254.39,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="259.85,125.9492,250.85,121.9492,254.85,125.9492,250.85,129.9492,259.85,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="229" y="122.4766"/><text fill="#000000" font-family=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:478px;height:194px;" version="1.1" viewBox="0 0 478 194" width="478px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="201" x="132" y="17.9999">XDocRe [...]
+cluster XDocReport\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,461,67.1997,461,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="42.5" y="43.5998">XDocReport</text><text fill="#000000" font-family="sans-serif"  [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="173" x="272" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="133" x="290" y="105.5999">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="282" y="124.7999">XdocReport (applib)</text><text fill="#FFFFFE" font-family="san [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="175" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="133" x="51" y="105.5999">Apache Isis Sub -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="155" x="42" y="124.7999">XdocReport (parent)</text><text fill="#FFFFFE" font-family="sans-s [...]
+link 2 to 3--><path d="M207.07,114.5999 C226.49,114.5999 247.15,114.5999 266.73,114.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="271.96,114.5999,262.96,110.5999,266.96,114.5999,262.96,118.5999,271.96,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="241" y="112.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=XDocReport)
 title XDocReport - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "XDocReport\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg b/content/core/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg
index 6b06a35..8dd0803 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:530px;height:210px;" version="1.1" viewBox="0 0 530 210" width="530px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="151" x="183" y="18.9492">Spring [...]
-cluster Spring\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,513,74.7383,513,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="39" x="56" y="47.6875">Spring</text><text fill="#000000" font-family="sans-serif" font-size= [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="297" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="307" y="114.293">Apache Isis Sub - Spring</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="370" y="135.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="42" y="114.293">Apache Isis Sub - Spring</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="104" y="135.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-link 2 to 3--><path d="M232.05,125.9492 C251.35,125.9492 271.65,125.9492 291.13,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="296.6,125.9492,287.6,121.9492,291.6,125.9492,287.6,129.9492,296.6,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="266" y="122.4766"/><text fill="#000000" font-family="sans- [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:554px;height:194px;" version="1.1" viewBox="0 0 554 194" width="554px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="155" x="193" y="17.9999">Spring [...]
+cluster Spring\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,537,67.1997,537,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="60.5" y="43.5998">Spring</text><text fill="#000000" font-family="sans-serif" font-siz [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="212" x="309" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="188" x="319" y="105.5999">Apache Isis Sub - Spring</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="386.5" y="124.7999">(applib)</text><text fill="#FFFFFE" font-family="sans-s [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="212" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="188" x="42" y="105.5999">Apache Isis Sub - Spring</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="108.5" y="124.7999">(parent)</text><text fill="#FFFFFE" font-family="sans-ser [...]
+link 2 to 3--><path d="M244.14,114.5999 C263.63,114.5999 284.04,114.5999 303.67,114.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="308.92,114.5999,299.92,110.5999,303.92,114.5999,299.92,118.5999,308.92,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="278" y="112.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=Spring)
 title Spring - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "Spring\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg b/content/core/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg
index fbfa13a..79b1afa 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="770px" preserveAspectRatio="none" style="width:552px;height:770px;" version="1.1" viewBox="0 0 552 770" width="552px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="132" x="203.5" y="18.9492">JDO  [...]
-cluster JDO\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,535,74.7383,535,740.9492,16,740.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="24" x="63.5" y="47.6875">JDO</text><text fill="#000000" font-family="sans-serif" font-size="14" [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="32" y="368.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="42" y="395.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="28" x="120.5" y="416.8867">JDO</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="308" y="647.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="318" y="674.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="88" x="366.5" y="695.8867">JDO (Spring)</text><text fill="#FFFFFE" font-family="s [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="308" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="318" y="562.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="87" x="367" y="583.8867">JDO (applib)</text><text fill="#FFFFFE" font-family="san [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="308" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="318" y="450.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="351" y="471.8867">JDO (integration)</text><text fill="#FFFFFE" font-famil [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="308" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="318" y="338.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="123" x="349" y="359.8867">JDO (metamodel)</text><text fill="#FFFFFE" font-family= [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="308" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="318" y="226.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="100" x="360.5" y="247.8867">JDO (provider)</text><text fill="#FFFFFE" font-family [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="302" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="318" y="114.293">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="312" y="135.8867">JDO Provider (DataNucleus)</text><text fill="#FFFFFE" fo [...]
-link 2 to 8--><path d="M157.07,445.8292 C185.3,493.9492 238.7,576.1092 302,629.9492 C308.11,635.1392 314.78,640.0292 321.7,644.5892 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="326.05,647.3892,320.6424,639.1577,321.8441,644.6854,316.3164,645.8871,326.05,647.3892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" [...]
-link 2 to 3--><path d="M190.04,445.4692 C222.1,467.5592 263.73,495.3092 302,517.9492 C310.48,522.9692 319.46,528.0192 328.47,532.9392 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="332.89,535.3392,326.8848,527.533,328.4945,532.956,323.0716,534.5657,332.89,535.3392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" [...]
-link 2 to 5--><path d="M237.14,427.3492 C258.43,431.6292 280.94,436.1392 302.42,440.4592 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="307.57,441.4892,299.5356,435.7928,302.6682,440.5031,297.9579,443.6357,307.57,441.4892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="430.4766"/><!--MD5=[8d5e64f07a3a0265301 [...]
-link 2 to 6--><path d="M237.14,385.8092 C258.43,381.3792 280.94,376.6892 302.42,372.2192 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="307.57,371.1492,297.946,369.0566,302.6738,372.1627,299.5676,376.8905,307.57,371.1492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271" y="376.4766"/><!--MD5=[f03a35d0a29bcf5b4caf [...]
-link 2 to 7--><path d="M188.83,368.4292 C221.01,345.7892 263.16,317.1392 302,293.9492 C310.46,288.8992 319.43,283.8192 328.43,278.8892 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="332.84,276.4892,323.0216,277.2627,328.4445,278.8725,326.8348,284.2954,332.84,276.4892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 4--><path d="M156.74,368.1292 C184.82,319.6292 238.27,236.3992 302,181.9492 C308.09,176.7392 314.76,171.8492 321.68,167.2792 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="326.02,164.4792,316.29,166.0047,321.8206,167.1931,320.6322,172.7237,326.02,164.4792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="271 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="739px" preserveAspectRatio="none" style="width:562px;height:739px;" version="1.1" viewBox="0 0 562 739" width="562px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="140" x="204.5" y="17.9999">JDO  [...]
+cluster JDO\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,545,67.1997,545,710.5999,16,710.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="29" x="69" y="43.5998">JDO</text><text fill="#000000" font-family="sans-serif" font-size="14" f [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="32" y="362.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="42" y="388.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="34" x="123" y="407.7999">JDO</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="624.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="650.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="99" x="371.5" y="669.7999">JDO (Spring)</text><text fill="#FFFFFE" font-family=" [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="519.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="545.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="95" x="373.5" y="564.7999">JDO (applib)</text><text fill="#FFFFFE" font-family=" [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="414.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="440.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="356" y="459.7999">JDO (integration)</text><text fill="#FFFFFE" font-fami [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="309.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="335.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="132" x="355" y="354.7999">JDO (metamodel)</text><text fill="#FFFFFE" font-family [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="204.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="230.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="112" x="365" y="249.7999">JDO (provider)</text><text fill="#FFFFFE" font-family= [...]
+entity 4--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="323" y="105.5999">Apache Isis Persistence -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="103" x="367.5" y="124.7999">JDO Provider</text><text fill="#FFFFFE" font-family=" [...]
+link 2 to 8--><path d="M163.18,432.9299 C192.84,477.9299 249.15,555.8999 313,606.5999 C319.92,612.0899 327.5,617.2199 335.33,621.9599 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="339.7,624.5599,334.009,616.5217,335.4025,622.0042,329.92,623.3977,339.7,624.5599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y= [...]
+link 2 to 3--><path d="M196.47,432.7599 C229.83,453.4999 273.38,479.8599 313,501.5999 C322.46,506.7899 332.49,512.0599 342.47,517.1599 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="347.05,519.4899,340.8474,511.8395,342.5951,517.2196,337.215,518.9673,347.05,519.4899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="28 [...]
+link 2 to 5--><path d="M248.07,417.5599 C267.62,421.1999 288.07,425.0099 307.76,428.6799 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="312.75,429.6099,304.6335,424.0312,307.8343,428.6953,303.1702,431.8962,312.75,429.6099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="421.5999"/><!--MD5=[8d5e64f07a3a0265301 [...]
+link 2 to 6--><path d="M248.07,377.2599 C267.62,373.5499 288.07,369.6599 307.76,365.9199 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="312.75,364.9699,303.1638,362.7104,307.8369,365.8982,304.6492,370.5713,312.75,364.9699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="369.5999"/><!--MD5=[f03a35d0a29bcf5b4ca [...]
+link 2 to 7--><path d="M194.79,362.5299 C228.29,341.1699 272.57,313.8099 313,291.5999 C321.87,286.7299 331.26,281.8199 340.65,277.0599 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="345.26,274.7399,335.4237,275.2374,340.7994,276.9988,339.038,282.3744,345.26,274.7399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="28 [...]
+link 2 to 4--><path d="M163.64,362.5599 C193.78,317.8099 250.6,239.7999 313,186.5999 C318.64,181.7899 324.71,177.1499 330.98,172.7199 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="335.36,169.6899,325.6848,171.531,331.2511,172.5389,330.2432,178.1052,335.36,169.6899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282 [...]
 @startuml(id=JDO)
 title JDO - Containers
 caption Artifact Hierarchy (Maven)
@@ -78,7 +78,7 @@ package "JDO\n[Software System]" {
 2 .[#707070].> 4 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg b/content/core/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg
index 10cfa61..1204524 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:234px;height:210px;" version="1.1" viewBox="0 0 234 210" width="234px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="153" x="34" y="18.9492">Viewer  [...]
-cluster Viewer\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,217,74.7383,217,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="40" x="55.5" y="47.6875">Viewer</text><text fill="#000000" font-family="sans-serif" font-siz [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="169" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="144" x="42" y="114.293">Apache Isis Viewer -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="112" x="60.5" y="135.8867">Common Model</text><text fill="#FFFFFE" font-family="sans-seri [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:242px;height:194px;" version="1.1" viewBox="0 0 242 194" width="242px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="158" x="35.5" y="17.9999">Viewe [...]
+cluster Viewer\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,225,67.1997,225,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="45" x="61" y="43.5998">Viewer</text><text fill="#000000" font-family="sans-serif" font-size= [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="177" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="42" y="105.5999">Apache Isis Viewer -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="121" x="60" y="124.7999">Common Model</text><text fill="#FFFFFE" font-family="sans-serif [...]
 @startuml(id=Viewer)
 title Viewer - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Viewer\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg b/content/core/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg
index dc43833..485023c 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:254px;height:210px;" version="1.1" viewBox="0 0 254 210" width="254px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="198" x="21.5" y="18.9492">Krovi [...]
-cluster Kroviz Client\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,237,74.7383,237,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="75" x="38" y="47.6875">Kroviz Client</text><text fill="#000000" font-family="sans-ser [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="164" x="42" y="114.293">Apache Isis Inc - Client</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="42" x="105.5" y="135.8867">kroViz</text><text fill="#FFFFFE" font-family="sans-serif" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:263px;height:194px;" version="1.1" viewBox="0 0 263 194" width="263px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="204" x="23" y="17.9999">Kroviz  [...]
+cluster Kroviz Client\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,246,67.1997,246,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="87" x="40" y="43.5998">Kroviz Client</text><text fill="#000000" font-family="sans-ser [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="198" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="42" y="105.5999">Apache Isis Inc - Client</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="48" x="107" y="124.7999">kroViz</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
 @startuml(id=Kroviz_Client)
 title Kroviz Client - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Kroviz Client\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg b/content/core/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg
index 516be4c..949f833 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:512px;height:210px;" version="1.1" viewBox="0 0 512 210" width="512px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="141" x="179" y="18.9492">Base - [...]
-cluster Base\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,495,74.7383,495,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="32" x="59.5" y="47.6875">Base</text><text fill="#000000" font-family="sans-serif" font-size="1 [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="191" x="288" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="166" x="298" y="114.293">Apache Isis Sub - Base</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="356.5" y="135.8867">(applib)</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="191" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="166" x="42" y="114.293">Apache Isis Sub - Base</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="99.5" y="135.8867">(parent)</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
-link 2 to 3--><path d="M223.08,125.9492 C242.5,125.9492 263.01,125.9492 282.61,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="287.84,125.9492,278.84,121.9492,282.84,125.9492,278.84,129.9492,287.84,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="257" y="122.4766"/><text fill="#000000" font-family="s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:528px;height:194px;" version="1.1" viewBox="0 0 528 194" width="528px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="144" x="185.5" y="17.9999">Base [...]
+cluster Base\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,511,67.1997,511,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="34" x="66.5" y="43.5998">Base</text><text fill="#000000" font-family="sans-serif" font-size="1 [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="199" x="296" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="306" y="105.5999">Apache Isis Sub - Base</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="367" y="124.7999">(applib)</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="199" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="42" y="105.5999">Apache Isis Sub - Base</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="102" y="124.7999">(parent)</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
+link 2 to 3--><path d="M231.18,114.5999 C250.62,114.5999 271.07,114.5999 290.68,114.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="295.91,114.5999,286.91,110.5999,290.91,114.5999,286.91,118.5999,295.91,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="265" y="112.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=Base)
 title Base - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "Base\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg b/content/core/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg
index 9959ca6..b2f274f 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="322px" preserveAspectRatio="none" style="width:530px;height:322px;" version="1.1" viewBox="0 0 530 322" width="530px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="263" x="127" y="18.9492">JAX-RS [...]
-cluster JAX-RS Client Library\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,149,30.9492,156,74.7383,513,74.7383,513,292.9492,16,292.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="127" x="20" y="47.6875">JAX-RS Client Library</text><text fill="#000000" font [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="297" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="307" y="226.293">Apache Isis Map - JaxRS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="100" x="347" y="247.8867">Client (applib)</text><text fill="#FFFFFE" font-family="s [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="297" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="307" y="114.293">Apache Isis Map - JaxRS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="86" x="354" y="135.8867">Client (impl)</text><text fill="#FFFFFE" font-family="sans- [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="32" y="172.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="42" y="199.293">Apache Isis Map - JaxRS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="102" x="81" y="220.8867">Client (parent)</text><text fill="#FFFFFE" font-family="sans [...]
-link 2 to 3--><path d="M232.05,221.1192 C251.35,223.0992 271.65,225.1792 291.13,227.1792 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="296.6,227.7492,288.0441,222.8711,291.625,227.2503,287.2458,230.8312,296.6,227.7492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="266" y="221.4766"/><!--MD5=[d209f2622dd5d3103b9c9b [...]
-link 2 to 4--><path d="M232.05,178.9392 C251.52,172.6492 271.99,166.0292 291.63,159.6792 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="296.6,158.0792,286.805,157.0509,291.8439,159.6217,289.273,164.6607,296.6,158.0792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="266" y="165.4766"/><text fill="#000000" font-family [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="299px" preserveAspectRatio="none" style="width:556px;height:299px;" version="1.1" viewBox="0 0 556 299" width="556px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="279" x="132" y="17.9999">JAX-RS [...]
+cluster JAX-RS Client Library\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,170,27.5999,177,67.1997,539,67.1997,539,270.5999,16,270.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="177" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="148" x="20" y="43.5998">JAX-RS Client Library</text><text fill="#000000" font [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="213" x="310" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="189" x="320" y="210.5999">Apache Isis Map - JaxRS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="105" x="364" y="229.7999">Client (applib)</text><text fill="#FFFFFE" font-family=" [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="213" x="310" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="189" x="320" y="105.5999">Apache Isis Map - JaxRS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="90" x="371.5" y="124.7999">Client (impl)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="213" x="32" y="125.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="189" x="42" y="151.5999">Apache Isis Map - JaxRS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="107" x="85" y="170.7999">Client (parent)</text><text fill="#FFFFFE" font-family="san [...]
+link 2 to 3--><path d="M245.03,183.1599 C264.53,187.3299 284.94,191.6899 304.6,195.8899 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="309.58,196.9599,301.6133,191.1693,304.6902,195.9161,299.9433,198.993,309.58,196.9599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="279" y="188.5999"/><!--MD5=[d209f2622dd5d3103b9c9 [...]
+link 2 to 4--><path d="M245.03,143.0099 C264.53,139.7599 284.94,136.3599 304.6,133.0799 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="309.58,132.2499,300.0483,129.7704,304.6469,133.0649,301.3524,137.6634,309.58,132.2499" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="279" y="135.5999"/><text fill="#000000" font-fam [...]
 @startuml(id=JAX-RS_Client_Library)
 title JAX-RS Client Library - Containers
 caption Artifact Hierarchy (Maven)
@@ -42,7 +42,7 @@ package "JAX-RS Client Library\n[Software System]" {
 2 .[#707070].> 4 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg b/content/core/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg
index 623e6fd..b2ba07b 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:562px;height:434px;" version="1.1" viewBox="0 0 562 434" width="562px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="154" x="197.5" y="18.9492">Wick [...]
-cluster Wicket\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,545,74.7383,545,404.9492,16,404.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="40" x="55.5" y="47.6875">Wicket</text><text fill="#000000" font-family="sans-serif" font-siz [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="32" y="210.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="42" y="237.293">Apache Isis Viewer - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="81.5" y="252.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="323" y="338.293">Apache Isis Viewer - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="54" x="394" y="359.8867">(Model)</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="323" y="226.293">Apache Isis Viewer - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="361.5" y="247.8867">(UI Components)</text><text fill="#FFFFFE" font-fam [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="216" x="313" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="323" y="114.293">Apache Isis Viewer - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="392.5" y="135.8867">(Viewer)</text><text fill="#FFFFFE" font-family="sans [...]
-link 2 to 3--><path d="M209.61,265.4892 C242.58,278.7292 282.74,294.8492 319.1,309.4492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="323.97,311.3992,317.1256,304.3173,319.3346,309.525,314.1268,311.734,323.97,311.3992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="290.4766"/><!--MD5=[d209f2622dd5d3103b9c9b [...]
-link 2 to 4--><path d="M248.07,237.9492 C267.54,237.9492 287.9,237.9492 307.51,237.9492 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="312.75,237.9492,303.75,233.9492,307.75,237.9492,303.75,241.9492,312.75,237.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="234.4766"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
-link 2 to 5--><path d="M209.61,210.4092 C242.58,197.1692 282.74,181.0492 319.1,166.4492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="323.97,164.4992,314.1268,164.1644,319.3346,166.3734,317.1256,171.5811,323.97,164.4992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="282" y="178.4766"/><text fill="#000000" font-fam [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:512px;height:404px;" version="1.1" viewBox="0 0 512 404" width="512px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="157" x="171" y="17.9999">Wicket [...]
+cluster Wicket\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,495,67.1997,495,375.5999,16,375.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="60.5" y="43.5998">Wicket</text><text fill="#000000" font-family="sans-serif" font-siz [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="177" x="32" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="42" y="210.5999">Apache Isis Viewer -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="51" x="95" y="229.7999">Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="177" x="288" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="298" y="315.5999">Apache Isis Viewer -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="112" x="320.5" y="334.7999">Wicket (Model)</text><text fill="#FFFFFE" font-family="sa [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="274" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="298" y="210.5999">Apache Isis Viewer -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="185" x="284" y="229.7999">Wicket (UI Components)</text><text fill="#FFFFFE" font-fami [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="177" x="288" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="298" y="105.5999">Apache Isis Viewer -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="116" x="318.5" y="124.7999">Wicket (Viewer)</text><text fill="#FFFFFE" font-family="sa [...]
+link 2 to 3--><path d="M206.43,254.7099 C231.96,265.2599 260.04,276.8699 285.86,287.5399 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="290.65,289.5199,283.8698,282.3765,286.0317,287.6039,280.8042,289.7658,290.65,289.5199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="243" y="267.5999"/><!--MD5=[d209f2622dd5d3103b9 [...]
+link 2 to 4--><path d="M209.27,219.5999 C228.44,219.5999 248.93,219.5999 268.74,219.5999 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="273.76,219.5999,264.76,215.5999,268.76,219.5999,264.76,223.5999,273.76,219.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="243" y="217.5999"/><!--MD5=[4e74f4bf4b09d37138dfb3a42 [...]
+link 2 to 5--><path d="M206.43,184.4899 C231.96,173.9399 260.04,162.3299 285.86,151.6599 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="290.65,149.6799,280.8042,149.4339,286.0317,151.5958,283.8698,156.8233,290.65,149.6799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="243" y="168.5999"/><text fill="#000000" font-fa [...]
 @startuml(id=Wicket)
 title Wicket - Containers
 caption Artifact Hierarchy (Maven)
@@ -51,7 +51,7 @@ package "Wicket\n[Software System]" {
 2 .[#707070].> 5 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg b/content/core/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg
index ea95559..85950c2 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1466px" preserveAspectRatio="none" style="width:489px;height:1466px;" version="1.1" viewBox="0 0 489 1466" width="489px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="138" x="169" y="18.9492">Cor [...]
-cluster Core\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,472,74.7383,472,1436.9492,16,1436.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="29" x="61" y="47.6875">Core</text><text fill="#000000" font-family="sans-serif" font-size="1 [...]
-entity 14--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="149" x="272" y="1343.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="124" x="282" y="1370.293">Apache Isis - JDK</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="99" x="297" y="1391.8867">Supplemental</text><text fill="#FFFFFE" font-family="sans-se [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="140" x="32" y="715.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="120" x="42" y="742.293">Apache Isis Core</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="43.5" y="757.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="245" y="1253.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="183" x="255" y="1280.293">Apache Isis Core - AppLib</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="292" y="1295.5703">[Container: packaging: jar]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="197" x="248" y="1141.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="172" x="258" y="1168.293">Apache Isis Core - Code</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="287" y="1189.8867">Gen (ByteBuddy)</text><text fill="#FFFFFE" font-family [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="155" x="269" y="1029.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="279" y="1056.293">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="95" x="299" y="1077.8867">Configuration</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="155" x="269" y="917.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="279" y="944.293">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="76" x="308.5" y="965.8867">Interaction</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="155" x="269" y="805.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="279" y="832.293">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="80" x="306.5" y="853.8867">MetaModel</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-entity 9--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="214" x="239.5" y="715.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="249.5" y="742.293">Apache Isis Core - Runtime</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="292" y="757.5703">[Container: packaging: jar]</text><!--MD5=[832467b18690d1dd1b9afbdc6cb3d7bf]
-entity 10--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="219" x="237" y="603.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="247" y="630.293">Apache Isis Core - Runtime</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="60" x="316.5" y="651.8867">Services</text><text fill="#FFFFFE" font-family="san [...]
-entity 15--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="155" x="269" y="491.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="279" y="518.293">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="66" x="313.5" y="539.8867">Schemas</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
-entity 11--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="212" x="240.5" y="401.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="192" x="250.5" y="428.293">Apache Isis Core - Security</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="292" y="443.5703">[Container: packaging: jar]</text><!--MD5=[2e47fe9ff0124b653d7be087 [...]
-entity 12--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="155" x="269" y="289.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="279" y="316.293">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="83" x="305" y="337.8867">Transaction</text><text fill="#FFFFFE" font-family="sans-serif [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="237.5" y="177.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="247.5" y="204.293">Apache Isis Core - Unit Test</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="318.5" y="225.8867">Support</text><text fill="#FFFFFE" font-family= [...]
-entity 13--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="213" x="240" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="193" x="250" y="114.293">Apache Isis Core - WebApp</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="292" y="129.5703">[Container: packaging: jar]</text><!--MD5=[3c15ce39e8e568d8007db2b3de990d68]
-link 2 to 14--><path d="M105.99,770.5192 C117.73,874.1792 163.64,1239.0592 237,1325.9492 C245.39,1335.8892 255.99,1344.2792 267.26,1351.2892 " fill="none" id="2-to-14" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="271.78,1354.0092,266.1324,1345.9405,267.4963,1351.4304,262.0064,1352.7943,271.78,1354.0092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLen [...]
-link 2 to 3--><path d="M102.51,770.5592 C102.54,852.2192 113.53,1095.6092 237,1235.9492 C241.82,1241.4192 247.4,1246.2492 253.45,1250.4892 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="257.71,1253.3392,252.4734,1244.9979,253.5608,1250.5492,248.0094,1251.6366,257.71,1253.3392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength [...]
-link 2 to 4--><path d="M105.75,770.6192 C113.83,838.6192 143.2,1016.1892 237,1123.9492 C241.44,1129.0492 246.45,1133.7392 251.83,1138.0592 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="256.01,1141.2792,251.3333,1132.6115,252.0533,1138.2224,246.4424,1138.9423,256.01,1141.2792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength [...]
-link 2 to 5--><path d="M110.51,770.7792 C126.04,823.7592 166.31,940.2392 237,1011.9492 C245.07,1020.1392 254.6,1027.3692 264.59,1033.6892 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="268.91,1036.3392,263.3339,1028.2209,264.6493,1033.7227,259.1475,1035.0381,268.91,1036.3392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength= [...]
-link 2 to 6--><path d="M121.42,770.4892 C145.07,804.2792 188.84,861.7692 237,899.9492 C245.43,906.6292 254.77,912.8592 264.35,918.5592 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="268.76,921.1392,263.0179,913.1374,264.4463,918.611,258.9727,920.0394,268.76,921.1392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="20 [...]
-link 2 to 8--><path d="M169.26,770.5492 C198.42,782.6892 232.95,797.0692 263.68,809.8692 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="268.58,811.9092,261.7998,804.7658,263.9617,809.9933,258.7342,812.1551,268.58,811.9092" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" y="781.4766"/><!--MD5=[676073e7019c75b59fc [...]
-link 2 to 9--><path d="M172.17,742.9492 C191.48,742.9492 212.96,742.9492 234.05,742.9492 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="239.12,742.9492,230.12,738.9492,234.12,742.9492,230.12,746.9492,239.12,742.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" y="739.4766"/><!--MD5=[ecc6855e18f9a45a4c7eaf523 [...]
-link 2 to 10--><path d="M169.26,715.3492 C193.56,705.2292 221.58,693.5592 248.04,682.5392 " fill="none" id="2-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="252.96,680.4892,243.1142,680.2433,248.3417,682.4052,246.1798,687.6326,252.96,680.4892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" y="698.4766"/><!--MD5=[62213bd213e9eab9c [...]
-link 2 to 15--><path d="M121.42,715.4092 C145.07,681.6192 188.84,624.1292 237,585.9492 C245.43,579.2692 254.77,573.0392 264.35,567.3392 " fill="none" id="2-to-15" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="268.76,564.7592,258.9727,565.8591,264.4463,567.2874,263.0179,572.761,268.76,564.7592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x=" [...]
-link 2 to 11--><path d="M109.75,715.4092 C124.2,661.8792 163,543.0092 237,473.9492 C242.93,468.4192 249.63,463.5192 256.72,459.1892 " fill="none" id="2-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="261.19,456.5692,251.4027,457.6691,256.8763,459.0974,255.4479,464.571,261.19,456.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="206" [...]
-link 2 to 12--><path d="M106.47,715.1892 C115.94,649.8792 147.81,484.4692 237,383.9492 C244.82,375.1392 254.35,367.5192 264.49,360.9792 " fill="none" id="2-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="268.87,358.2392,259.1193,359.6261,264.6324,360.8931,263.3654,366.4062,268.87,358.2392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x= [...]
-link 2 to 7--><path d="M103.5,715.3392 C106.33,636.9192 124.35,409.6292 237,271.9492 C241.23,266.7892 246.05,262.0492 251.27,257.6992 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="255.33,254.4592,245.7967,256.9325,251.4173,257.5722,250.7776,263.1928,255.33,254.4592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="20 [...]
-link 2 to 13--><path d="M105.9,715.2992 C117.3,611.3492 162.15,245.5592 237,159.9492 C241.8,154.4592 247.37,149.6292 253.41,145.3692 " fill="none" id="2-to-13" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="257.66,142.5192,247.9567,144.2064,253.5063,145.3026,252.4101,150.8522,257.66,142.5192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="20 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1436px" preserveAspectRatio="none" style="width:498px;height:1436px;" version="1.1" viewBox="0 0 498 1436" width="498px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="142" x="171.5" y="17.9999">C [...]
+cluster Core\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,481,67.1997,481,1407.5999,16,1407.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="32" x="67.5" y="43.5998">Core</text><text fill="#000000" font-family="sans-serif" font-size= [...]
+entity 14--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="159" x="276.5" y="1321.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="135" x="286.5" y="1347.5999">Apache Isis - JDK</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="105" x="303.5" y="1366.7999">Supplemental</text><text fill="#FFFFFE" font-family= [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="150" x="32" y="719.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="42" y="745.0999">Apache Isis Core</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="47" y="758.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="247" y="1235.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="257" y="1261.0999">Apache Isis Core - AppLib</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="300.5" y="1274.2999">[Container: packaging: jar]</text><!--MD5=[ca8cb0432c9090f8973c99138b4c3ca0]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="208" x="252" y="1129.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="262" y="1155.5999">Apache Isis Core - Code</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="129" x="291.5" y="1174.7999">Gen (ByteBuddy)</text><text fill="#FFFFFE" font-fam [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="1024.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="1050.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="105" x="303.5" y="1069.7999">Configuration</text><text fill="#FFFFFE" font-family [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="919.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="945.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="82" x="315" y="964.7999">Interaction</text><text fill="#FFFFFE" font-family="sans-s [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="814.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="840.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="84" x="314" y="859.7999">MetaModel</text><text fill="#FFFFFE" font-family="sans-ser [...]
+entity 9--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="709.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="735.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="64" x="324" y="754.7999">Runtime</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 10--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="604.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="630.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="134" x="289" y="649.7999">Runtime Services</text><text fill="#FFFFFE" font-family= [...]
+entity 15--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="525.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="71" x="320.5" y="544.7999">Schemas</text><text fill="#FFFFFE" font-family="sans-se [...]
+entity 11--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="420.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="63" x="324.5" y="439.7999">Security</text><text fill="#FFFFFE" font-family="sans-s [...]
+entity 12--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="315.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="91" x="310.5" y="334.7999">Transaction</text><text fill="#FFFFFE" font-family="san [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="198" x="257" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="267" y="210.5999">Apache Isis Core - Unit</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="99" x="306.5" y="229.7999">Test Support</text><text fill="#FFFFFE" font-family="sa [...]
+entity 13--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="163" x="274.5" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="284.5" y="105.5999">Apache Isis Core -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="65" x="323.5" y="124.7999">WebApp</text><text fill="#FFFFFE" font-family="sans-seri [...]
+link 2 to 14--><path d="M111.28,770.3999 C124.28,869.0099 175.01,1220.7499 247,1303.5999 C254.13,1311.7999 262.82,1318.8599 272.15,1324.8999 " fill="none" id="2-to-14" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="276.47,1327.5999,270.9654,1319.4329,272.2324,1324.946,266.7193,1326.213,276.47,1327.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLengt [...]
+link 2 to 3--><path d="M108.16,770.2799 C110,847.8399 125.82,1082.5899 247,1216.5999 C252.45,1222.6299 258.86,1227.8499 265.77,1232.3699 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="270.14,1235.0899,264.6034,1226.9446,265.892,1232.4527,260.3839,1233.7413,270.14,1235.0899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0 [...]
+link 2 to 4--><path d="M111.16,770.1899 C120.41,835.0999 153,1008.2999 247,1111.5999 C251.97,1117.0599 257.62,1122.0199 263.68,1126.5199 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="267.94,1129.5599,262.9301,1121.0804,263.8675,1126.6591,258.2888,1127.5965,267.94,1129.5599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
+link 2 to 5--><path d="M115.63,770.2399 C131.98,821.2899 174.89,936.7299 247,1006.5999 C253.77,1013.1599 261.51,1019.0599 269.67,1024.3199 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.24,1027.1699,268.7157,1019.0162,269.996,1024.5263,264.4859,1025.8066,274.24,1027.1699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength= [...]
+link 2 to 6--><path d="M125.72,770.2099 C149.98,803.7999 196.33,862.9899 247,901.5999 C254.15,907.0499 261.95,912.1599 269.97,916.8999 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.45,919.4899,268.657,911.5249,270.1203,916.9892,264.6559,918.4524,274.45,919.4899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="21 [...]
+link 2 to 8--><path d="M168.11,770.1499 C198.59,783.1099 236.15,799.0799 269.58,813.2899 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.49,815.3699,267.7744,808.1656,269.8891,813.4123,264.6424,815.527,274.49,815.3699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="216" y="789.5999"/><!--MD5=[676073e7019c75b59fc2 [...]
+link 2 to 9--><path d="M182.11,744.5999 C209.53,744.5999 240.85,744.5999 269.22,744.5999 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.48,744.5999,265.48,740.5999,269.48,744.5999,265.48,748.5999,274.48,744.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="216" y="742.5999"/><!--MD5=[ecc6855e18f9a45a4c7eaf523 [...]
+link 2 to 10--><path d="M168.11,719.0499 C198.59,706.0899 236.15,690.1199 269.58,675.9099 " fill="none" id="2-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.49,673.8299,264.6424,673.6727,269.8891,675.7874,267.7744,681.0341,274.49,673.8299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="216" y="696.5999"/><!--MD5=[62213bd213e9eab9c [...]
+link 2 to 15--><path d="M125.44,719.0499 C149.55,685.2299 195.92,625.3499 247,586.5999 C254.13,581.1899 261.92,576.1299 269.94,571.4499 " fill="none" id="2-to-15" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.42,568.8899,264.6195,569.8648,270.0744,571.3629,268.5763,576.8177,274.42,568.8899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x= [...]
+link 2 to 11--><path d="M115.56,718.8199 C131.78,667.4899 174.47,551.4599 247,481.5999 C253.77,475.0799 261.5,469.2499 269.66,464.0599 " fill="none" id="2-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.23,461.2399,264.4675,462.541,269.9693,463.8564,268.6539,469.3582,274.23,461.2399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+link 2 to 12--><path d="M111.09,718.8999 C120.19,653.7099 152.43,479.8399 247,376.5999 C253.58,369.4099 261.37,363.1199 269.7,357.6199 " fill="none" id="2-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.38,354.6599,264.6405,356.1235,270.1635,357.347,268.9399,362.87,274.38,354.6599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="216 [...]
+link 2 to 7--><path d="M108.53,718.9299 C111.43,641.8699 129.97,409.4299 247,271.5999 C251.29,266.5399 256.19,261.9399 261.48,257.7599 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="265.59,254.6399,256.004,256.9001,261.6089,257.6649,260.8441,263.2698,265.59,254.6399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="21 [...]
+link 2 to 13--><path d="M111.11,719.0399 C123.77,618.8099 174.17,253.8599 247,166.5999 C253.53,158.7699 261.52,152.0399 270.16,146.2599 " fill="none" id="2-to-13" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.46,143.5099,264.73,145.0354,270.2606,146.2238,269.0722,151.7544,274.46,143.5099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
 @startuml(id=Core)
 title Core - Containers
 caption Artifact Hierarchy (Maven)
@@ -141,7 +141,7 @@ package "Core\n[Software System]" {
 2 .[#707070].> 13 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg b/content/core/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg
index de52503..8f16efa 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="658px" preserveAspectRatio="none" style="width:515px;height:658px;" version="1.1" viewBox="0 0 515 658" width="515px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="221" x="140.5" y="18.9492">Rest [...]
-cluster Restful Objects\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,498,74.7383,498,628.9492,16,628.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="93" x="29" y="47.6875">Restful Objects</text><text fill="#000000" font-family="sans [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="190" x="32" y="322.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="42" y="349.293">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="68.5" y="364.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="287" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="297" y="562.293">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="58" x="355.5" y="583.8867">(AppLib)</text><text fill="#FFFFFE" font-family="sans-se [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="287" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="297" y="450.293">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="151" x="309" y="471.8867">(JAX-RS Resteasy v4)</text><text fill="#FFFFFE" font-fami [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="287" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="297" y="338.293">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="82" x="343.5" y="359.8867">(Rendering)</text><text fill="#FFFFFE" font-family="sans [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="287" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="297" y="226.293">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="61" x="354" y="247.8867">(Testing)</text><text fill="#FFFFFE" font-family="sans-ser [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="287" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="297" y="114.293">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="356" y="135.8867">(Viewer)</text><text fill="#FFFFFE" font-family="sans-serif [...]
-link 2 to 3--><path d="M149.87,377.5792 C178.75,412.9192 232.36,474.7192 287,517.9492 C293.35,522.9792 300.21,527.8492 307.22,532.4992 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="311.61,535.3592,306.242,527.1018,307.4171,532.6353,301.8837,533.8104,311.61,535.3592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="25 [...]
-link 2 to 4--><path d="M190.83,377.4892 C220.83,390.6392 257.33,406.6392 290.46,421.1592 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="295.32,423.2992,288.6779,416.0272,290.7392,421.2951,285.4713,423.3565,295.32,423.2992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256" y="402.4766"/><!--MD5=[4e74f4bf4b09d37138d [...]
-link 2 to 5--><path d="M222.05,349.9492 C241.38,349.9492 261.82,349.9492 281.42,349.9492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="286.65,349.9492,277.65,345.9492,281.65,349.9492,277.65,353.9492,286.65,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256" y="346.4766"/><!--MD5=[8d5e64f07a3a026530162c78b [...]
-link 2 to 6--><path d="M190.83,322.4092 C220.83,309.2592 257.33,293.2592 290.46,278.7392 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="295.32,276.5992,285.4713,276.542,290.7392,278.6033,288.6779,283.8712,295.32,276.5992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256" y="290.4766"/><!--MD5=[f03a35d0a29bcf5b4caf [...]
-link 2 to 7--><path d="M149.87,322.3192 C178.75,286.9792 232.36,225.1792 287,181.9492 C293.35,176.9192 300.21,172.0492 307.22,167.3992 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="311.61,164.5392,301.8837,166.088,307.4171,167.2632,306.242,172.7966,311.61,164.5392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="614px" preserveAspectRatio="none" style="width:538px;height:614px;" version="1.1" viewBox="0 0 538 614" width="538px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="225" x="150" y="17.9999">Restfu [...]
+cluster Restful Objects\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,521,67.1997,521,585.5999,16,585.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="106" x="30.5" y="43.5998">Restful Objects</text><text fill="#000000" font-family="s [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="202" x="32" y="299.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="42" y="325.0999">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="73" y="338.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="299" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="309" y="525.5999">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="65" x="369.5" y="544.7999">(AppLib)</text><text fill="#FFFFFE" font-family="sans-s [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="299" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="309" y="420.5999">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="166" x="319" y="439.7999">(JAX-RS Resteasy v4)</text><text fill="#FFFFFE" font-fam [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="299" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="309" y="315.5999">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="90" x="357" y="334.7999">(Rendering)</text><text fill="#FFFFFE" font-family="sans- [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="299" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="309" y="210.5999">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="67" x="368.5" y="229.7999">(Testing)</text><text fill="#FFFFFE" font-family="sans- [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="299" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="309" y="105.5999">Apache Isis Viewer - RO</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="61" x="371.5" y="124.7999">(Viewer)</text><text fill="#FFFFFE" font-family="sans-se [...]
+link 2 to 3--><path d="M156.7,350.2999 C186.9,383.4599 243,441.6299 299,481.5999 C306.47,486.9299 314.55,492.0599 322.77,496.8799 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="327.35,499.5299,321.557,491.5649,323.0203,497.0292,317.5559,498.4924,327.35,499.5299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="268" y= [...]
+link 2 to 4--><path d="M198.97,350.1499 C231.47,362.9299 271.41,378.6399 307.17,392.6999 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="311.96,394.5799,305.0445,387.5673,307.3059,392.7525,302.1207,395.0139,311.96,394.5799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="268" y="375.5999"/><!--MD5=[4e74f4bf4b09d37138d [...]
+link 2 to 5--><path d="M234.18,324.5999 C253.6,324.5999 274.03,324.5999 293.68,324.5999 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="298.92,324.5999,289.92,320.5999,293.92,324.5999,289.92,328.5999,298.92,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="268" y="322.5999"/><!--MD5=[8d5e64f07a3a026530162c78b23a3473]
+link 2 to 6--><path d="M198.97,299.0499 C231.47,286.2699 271.41,270.5599 307.17,256.4999 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="311.96,254.6199,302.1207,254.1859,307.3059,256.4472,305.0445,261.6324,311.96,254.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="268" y="270.5999"/><!--MD5=[f03a35d0a29bcf5b4ca [...]
+link 2 to 7--><path d="M156.37,298.9399 C186.41,265.5299 242.58,206.6799 299,166.5999 C306.11,161.5499 313.78,156.6999 321.61,152.1399 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="325.97,149.6299,316.1759,150.6673,321.6403,152.1305,320.177,157.5949,325.97,149.6299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="26 [...]
 @startuml(id=Restful_Objects)
 title Restful Objects - Containers
 caption Artifact Hierarchy (Maven)
@@ -69,7 +69,7 @@ package "Restful Objects\n[Software System]" {
 2 .[#707070].> 7 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg b/content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg
index 5532943..8e9bafc 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1821px" preserveAspectRatio="none" style="width:811px;height:1821px;" version="1.1" viewBox="0 0 811 1821" width="811px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="187" x="305.5" y="18.9492">E [...]
-cluster Extensions\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,794,74.7383,794,1791.9492,16,1791.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="67" x="42" y="47.6875">Extensions</text><text fill="#000000" font-family="sans-serif"  [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="575" y="1698.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="164" x="585" y="1725.293">Apache Isis Ext - CORS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="40" x="649.5" y="1746.8867">(impl)</text><text fill="#FFFFFE" font-family="sans-se [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="294" y="1605.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="164" x="304" y="1632.293">Apache Isis Ext - CORS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="56" x="360.5" y="1653.8867">(parent)</text><text fill="#FFFFFE" font-family="sans- [...]
-entity 7--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="294" y="1331.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="304" y="1358.293">Apache Isis Ext - Flyway</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="330" y="1373.5703">[Container: packaging: pom]</text><!--MD5=[df1cfc51a8f3e60039521c9170723b8d]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="194" x="572.5" y="1586.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="582.5" y="1613.293">Apache Isis Ext - Flyway</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="30" x="654.5" y="1634.8867">Impl</text><text fill="#FFFFFE" font-family="san [...]
-entity 16--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="285.5" y="1149.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="295.5" y="1176.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="330" y="1191.5703">[Container: packaging: pom]</text><!--MD5=[dc00b6f0bfcb3e33cce0c0c [...]
-entity 17--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="564" y="1474.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="574" y="1501.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="22" x="658.5" y="1522.8867">API</text><text fill="#FFFFFE" font-family="sans-s [...]
-entity 18--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="564" y="1362.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="574" y="1389.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="180" x="579.5" y="1410.8867">Encryption (Using jbcrypt)</text><text fill="#FFF [...]
-entity 19--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="564" y="1250.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="574" y="1277.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="44" x="647.5" y="1298.8867">Model</text><text fill="#FFFFFE" font-family="sans [...]
-entity 20--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="564" y="1138.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="574" y="1165.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="584.5" y="1186.8867">Persistence (Using JDO)</text><text fill="#FFFFFE [...]
-entity 21--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="564" y="1026.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="574" y="1053.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="166" x="586.5" y="1074.8867">Persistence (Using JPA)</text><text fill="#FFFFFE [...]
-entity 22--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="564" y="914.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="574" y="941.293">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="141" x="599" y="962.8867">Realm (Using Shiro)</text><text fill="#FFFFFE" font-fa [...]
-entity 24--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="215" x="562" y="802.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="572" y="829.293">Apache Isis Ext - Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="582.5" y="850.8867">Shiro LDAP Realm (impl)</text><text fill="#FFFFFE [...]
-entity 23--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="215" x="281" y="802.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="291" y="829.293">Apache Isis Ext - Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="293.5" y="850.8867">Shiro LDAP Realm (parent)</text><text fill="#FFFF [...]
-entity 5--><rect fill="#438DD5" height="98.2773" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="288.5" y="668.9492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="301" y="695.793">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="298.5" y="717.3867">Viewer - Excel Download</text><text fill="#FFFFFE" f [...]
-entity 6--><rect fill="#438DD5" height="98.2773" style="stroke:#2E6295;stroke-width:1.5;" width="200" x="569.5" y="668.9492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="582" y="695.793">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="175" x="579.5" y="717.3867">Viewer - Excel Download</text><text fill="#FFFFFE" f [...]
-entity 10--><rect fill="#438DD5" height="98.2773" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="572" y="535.9492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="582" y="562.793">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="146" x="594" y="584.3867">Viewer - fullcalendar</text><text fill="#FFFFFE" font-f [...]
-entity 9--><rect fill="#438DD5" height="98.2773" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="291" y="535.9492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="301" y="562.793">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="146" x="313" y="584.3867">Viewer - fullcalendar</text><text fill="#FFFFFE" font-fa [...]
-entity 11--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="572" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="582" y="450.293">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="174" x="582.5" y="471.8867">Viewer - fullcalendar (ui)</text><text fill="#FFFFFE" [...]
-entity 13--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="572" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="582" y="338.293">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="161" x="589" y="359.8867">Viewer - pdf.js (applib)</text><text fill="#FFFFFE" fon [...]
-entity 14--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="561" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="582" y="226.293">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="571" y="247.8867">Viewer - pdf.js (metamodel)</text><text fill="#FFFFFE"  [...]
-entity 12--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="291" y="270.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="301" y="297.293">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="163" x="307" y="318.8867">Viewer - pdf.js (parent)</text><text fill="#FFFFFE" fon [...]
-entity 15--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="195" x="572" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="582" y="114.293">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="130" x="604.5" y="135.8867">Viewer - pdf.js (ui)</text><text fill="#FFFFFE" font-f [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="184" x="32" y="813.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="164" x="42" y="840.293">Apache Isis Extensions</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="65.5" y="855.5703">[Container: packaging: pom]</text><!--MD5=[b1f22f0c97e7f2b556a5a2d67c42ac53]
-link 3 to 4--><path d="M483.18,1675.1792 C511.01,1684.4492 541.59,1694.6492 569.73,1704.0292 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="574.59,1705.6492,567.3048,1699.0216,569.8437,1704.0767,564.7887,1706.6156,574.59,1705.6492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="1687.4766"/><!--MD5=[5ca979b54 [...]
-link 7 to 8--><path d="M406.63,1386.4692 C434.62,1429.7092 493.82,1514.2792 561,1568.9492 C567.35,1574.1192 574.26,1579.0092 581.4,1583.5892 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="585.88,1586.3992,580.3952,1578.219,581.6488,1583.7352,576.1327,1584.9888,585.88,1586.3992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLengt [...]
-link 16 to 17--><path d="M414.21,1204.6592 C437.24,1231.3892 471.61,1273.5992 496,1313.9492 C532.12,1373.6992 512.98,1406.2792 561,1456.9492 C565.94,1462.1592 571.47,1466.9792 577.35,1471.4192 " fill="none" id="16-to-17" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="581.48,1474.4292,576.5576,1465.8987,577.4376,1471.4867,571.8496,1472.3666,581.48,1474.4292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans [...]
-link 16 to 18--><path d="M412.95,1204.5092 C444.17,1240.0492 502.3,1302.3592 561,1344.9492 C568.11,1350.1092 575.77,1355.0792 583.6,1359.7792 " fill="none" id="16-to-18" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="587.96,1362.3592,582.2493,1354.335,583.6562,1359.8141,578.1771,1361.2211,587.96,1362.3592" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLe [...]
-link 16 to 19--><path d="M458.11,1204.4892 C491.08,1217.7292 531.24,1233.8492 567.6,1248.4492 " fill="none" id="16-to-19" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="572.47,1250.3992,565.6256,1243.3173,567.8346,1248.525,562.6268,1250.734,572.47,1250.3992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="1229.4766"/><!--MD5=[44ad4254 [...]
-link 16 to 20--><path d="M491.81,1176.9492 C513.55,1176.9492 536.59,1176.9492 558.6,1176.9492 " fill="none" id="16-to-20" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="563.87,1176.9492,554.87,1172.9492,558.87,1176.9492,554.87,1180.9492,563.87,1176.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="1173.4766"/><!--MD5=[c81cc3f2353e [...]
-link 16 to 21--><path d="M458.11,1149.4092 C491.08,1136.1692 531.24,1120.0492 567.6,1105.4492 " fill="none" id="16-to-21" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="572.47,1103.4992,562.6268,1103.1644,567.8346,1105.3734,565.6256,1110.5811,572.47,1103.4992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="1117.4766"/><!--MD5=[fc5d01 [...]
-link 16 to 22--><path d="M412.95,1149.3892 C444.17,1113.8492 502.3,1051.5392 561,1008.9492 C568.11,1003.7892 575.77,998.8192 583.6,994.1192 " fill="none" id="16-to-22" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="587.96,991.5392,578.1771,992.6774,583.6562,994.0843,582.2493,999.5634,587.96,991.5392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
-link 23 to 24--><path d="M496.17,840.9492 C516.03,840.9492 536.82,840.9492 556.82,840.9492 " fill="none" id="23-to-24" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="561.89,840.9492,552.89,836.9492,556.89,840.9492,552.89,844.9492,561.89,840.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="837.4766"/><!--MD5=[deed8cab30c10dbe2727e [...]
-link 5 to 6--><path d="M488.65,717.9492 C513.07,717.9492 539.29,717.9492 563.96,717.9492 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="569.2,717.9492,560.2,713.9492,564.2,717.9492,560.2,721.9492,569.2,717.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="714.4766"/><!--MD5=[d626a4137f042c9ed96693ba98ea08de]
-link 9 to 10--><path d="M486.3,584.9492 C512.27,584.9492 540.42,584.9492 566.65,584.9492 " fill="none" id="9-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="571.87,584.9492,562.87,580.9492,566.87,584.9492,562.87,588.9492,571.87,584.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="581.4766"/><!--MD5=[3a9de236b82b3780bb92df01 [...]
-link 9 to 11--><path d="M486.3,542.2792 C515.43,529.4292 547.31,515.3792 576.15,502.6592 " fill="none" id="9-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="580.75,500.6392,570.9012,500.6078,576.1745,502.6553,574.1269,507.9286,580.75,500.6392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="520.4766"/><!--MD5=[5cad5af0897dff878c [...]
-link 12 to 13--><path d="M486.3,323.1692 C512.27,326.9892 540.42,331.1292 566.65,334.9792 " fill="none" id="12-to-13" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="571.87,335.7492,563.5495,330.4796,566.9234,335.0201,562.3829,338.3941,571.87,335.7492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="326.4766"/><!--MD5=[f674991f2698b6f0 [...]
-link 12 to 14--><path d="M486.3,284.3192 C508.78,278.5992 532.9,272.4592 555.99,266.5792 " fill="none" id="12-to-14" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="560.9,265.3292,551.1882,263.692,556.0569,266.5721,553.1768,271.4409,560.9,265.3292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="530" y="270.4766"/><!--MD5=[1f1a23f512ee359f5114 [...]
-link 12 to 15--><path d="M437.23,270.4392 C470.86,244.0992 517.49,209.1592 561,181.9492 C568.98,176.9592 577.45,172.0092 586,167.2292 " fill="none" id="12-to-15" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="590.75,164.5892,580.94,165.4634,586.3792,167.0174,584.8252,172.4566,590.75,164.5892" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="53 [...]
-link 2 to 3--><path d="M131.14,868.6392 C149.79,951.2492 208.91,1202.7192 281,1403.9492 C306.19,1474.2692 342.77,1552.9092 365.84,1600.3992 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="368.16,1605.1792,367.8259,1595.336,365.9755,1600.6817,360.6298,1598.8313,368.16,1605.1792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength [...]
-link 2 to 7--><path d="M133.39,868.4492 C153.63,932.8292 208.85,1097.2992 281,1221.9492 C303.51,1260.8392 335.95,1300.9192 359.1,1327.5992 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="362.44,1331.4392,359.544,1322.0258,359.1556,1327.6693,353.5121,1327.2808,362.44,1331.4392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength= [...]
-link 2 to 16--><path d="M146.7,868.7292 C195.02,930.5792 311.23,1079.3192 362.49,1144.9392 " fill="none" id="2-to-16" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="365.77,1149.1392,363.3948,1139.5811,362.6973,1145.1948,357.0836,1144.4973,365.77,1149.1392" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="250" y="995.4766"/><!--MD5=[0eceafed0ca [...]
-link 2 to 23--><path d="M216.07,840.9492 C235.32,840.9492 255.84,840.9492 275.76,840.9492 " fill="none" id="2-to-23" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="280.8,840.9492,271.8,836.9492,275.8,840.9492,271.8,844.9492,280.8,840.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="250" y="837.4766"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
-link 2 to 5--><path d="M183.91,813.3492 C213.35,799.5492 249.85,782.4492 283.78,766.5492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="288.33,764.4192,278.4833,764.6276,283.8049,766.5461,281.8864,771.8677,288.33,764.4192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="250" y="780.4766"/><!--MD5=[676073e7019c75b59fc [...]
-link 2 to 9--><path d="M143.25,813.3792 C170.15,774.1092 223.52,701.2692 281,650.9492 C286.45,646.1792 292.29,641.5292 298.32,637.0492 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="302.52,633.9792,292.8896,636.0419,298.4776,636.9218,297.5976,642.5098,302.52,633.9792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 12--><path d="M138.16,813.1992 C164.76,757.1992 227.02,626.7292 281,517.9492 C309.56,460.3992 343.36,394.4192 365.1,352.2392 " fill="none" id="2-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="367.43,347.7292,359.7402,353.8828,365.1313,352.1695,366.8446,357.5607,367.43,347.7292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1724px" preserveAspectRatio="none" style="width:832px;height:1724px;" version="1.1" viewBox="0 0 832 1724" width="832px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="190" x="314.5" y="17.9999">E [...]
+cluster Extensions\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,815,67.1997,815,1695.5999,16,1695.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="77" x="45" y="43.5998">Extensions</text><text fill="#000000" font-family="sans-serif"  [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="587.5" y="1609.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="597.5" y="1635.5999">Apache Isis Ext - CORS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="42" x="668" y="1654.7999">(impl)</text><text fill="#FFFFFE" font-family="sans [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="203" x="303.5" y="1496.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="313.5" y="1522.5999">Apache Isis Ext - CORS</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="59" x="375.5" y="1541.7999">(parent)</text><text fill="#FFFFFE" font-family=" [...]
+entity 7--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="204" x="303" y="1347.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="313" y="1373.0999">Apache Isis Ext - Flyway</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="345" y="1386.2999">[Container: packaging: pom]</text><!--MD5=[df1cfc51a8f3e60039521c9170723b8d]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="208" x="585" y="1504.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="595" y="1530.5999">Apache Isis Ext - Flyway</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="33" x="672.5" y="1549.7999">Impl</text><text fill="#FFFFFE" font-family="sans-s [...]
+entity 16--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="296.5" y="1094.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="306.5" y="1120.0999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="345" y="1133.2999">[Container: packaging: pom]</text><!--MD5=[dc00b6f0bfcb3e33cce0c0c30 [...]
+entity 17--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="580.5" y="1399.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="590.5" y="1425.5999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="27" x="675.5" y="1444.7999">API</text><text fill="#FFFFFE" font-family="s [...]
+entity 18--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="220" x="579" y="1294.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="590.5" y="1320.5999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="200" x="589" y="1339.7999">Encryption (Using jbcrypt)</text><text fill="#FF [...]
+entity 19--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="580.5" y="1189.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="590.5" y="1215.5999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="47" x="665.5" y="1234.7999">Model</text><text fill="#FFFFFE" font-family= [...]
+entity 20--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="580.5" y="1084.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="590.5" y="1110.5999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="595.5" y="1129.7999">Persistence (Using JDO)</text><text fill="#F [...]
+entity 21--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="580.5" y="979.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="590.5" y="1005.5999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="184" x="597" y="1024.7999">Persistence (Using JPA)</text><text fill="#FFFF [...]
+entity 22--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="580.5" y="874.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="590.5" y="900.5999">Apache Isis Ext - Sec Man</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="152" x="613" y="919.7999">Realm (Using Shiro)</text><text fill="#FFFFFE" fo [...]
+entity 24--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="580" y="769.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="590" y="795.5999">Apache Isis Ext - Security</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="196" x="591" y="814.7999">- Shiro LDAP Realm (impl)</text><text fill="#FFFFFE" [...]
+entity 23--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="296" y="769.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="194" x="306" y="795.5999">Apache Isis Ext - Security</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="150" x="328" y="814.7999">- Shiro LDAP Realm</text><text fill="#FFFFFE" font-f [...]
+entity 5--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="299.5" y="644.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="312" y="670.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="309.5" y="689.7999">Viewer - Excel Download</text><text fill="#FFFFFE"  [...]
+entity 6--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="583.5" y="644.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="596" y="670.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="593.5" y="689.7999">Viewer - Excel Download</text><text fill="#FFFFFE"  [...]
+entity 10--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="586" y="519.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="596" y="545.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="610.5" y="564.7999">Viewer - fullcalendar</text><text fill="#FFFFFE" fon [...]
+entity 9--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="302" y="519.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="312" y="545.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="153" x="326.5" y="564.7999">Viewer - fullcalendar</text><text fill="#FFFFFE" font [...]
+entity 11--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="586" y="414.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="596" y="440.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="181" x="598.5" y="459.7999">Viewer - fullcalendar (ui)</text><text fill="#FFFFFE [...]
+entity 13--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="586" y="309.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="596" y="335.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="605.5" y="354.7999">Viewer - pdf.js (applib)</text><text fill="#FFFFFE"  [...]
+entity 14--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="586" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="596" y="210.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="106" x="634" y="229.7999">Viewer - pdf.js</text><text fill="#FFFFFE" font-family [...]
+entity 12--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="302" y="268.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="312" y="294.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="169" x="320.5" y="313.7999">Viewer - pdf.js (parent)</text><text fill="#FFFFFE"  [...]
+entity 15--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="206" x="586" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="182" x="596" y="105.5999">Apache Isis Ext - Wicket</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="134" x="622" y="124.7999">Viewer - pdf.js (ui)</text><text fill="#FFFFFE" font-fa [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="199" x="32" y="789.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="179" x="42" y="815.0999">Apache Isis Extensions</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="71.5" y="828.2999">[Container: packaging: pom]</text><!--MD5=[b1f22f0c97e7f2b556a5a2d67c42ac53]
+link 3 to 4--><path d="M493.68,1566.7299 C526.04,1579.6999 562.8,1594.4299 595.57,1607.5599 " fill="none" id="3-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="600.37,1609.4899,593.4993,1602.4334,595.7276,1607.6329,590.5281,1609.8613,600.37,1609.4899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="1586.5999"/><!--MD5=[5ca979b543 [...]
+link 7 to 8--><path d="M441.92,1398.2499 C476.32,1422.3399 530.08,1458.7499 579,1486.5999 C588.28,1491.8799 598.16,1497.1499 608.04,1502.2099 " fill="none" id="7-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="612.57,1504.5099,606.3674,1496.8595,608.1151,1502.2396,602.735,1503.9873,612.57,1504.5099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLeng [...]
+link 16 to 17--><path d="M417.17,1145.1999 C440.54,1196.1899 499.08,1311.5199 579,1381.5999 C585.22,1387.0599 592.11,1392.0899 599.3,1396.6999 " fill="none" id="16-to-17" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="603.82,1399.5099,598.2957,1391.3562,599.576,1396.8663,594.0659,1398.1466,603.82,1399.5099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textL [...]
+link 16 to 18--><path d="M429.61,1145.1499 C461.29,1178.3999 520.38,1236.9399 579,1276.5999 C586.94,1281.9699 595.51,1287.1099 604.23,1291.9299 " fill="none" id="16-to-18" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="609.08,1294.5699,603.0943,1286.7486,604.6905,1292.1756,599.2635,1293.7718,609.08,1294.5699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" tex [...]
+link 16 to 19--><path d="M474.62,1145.1499 C508.95,1157.9299 551.13,1173.6399 588.89,1187.6999 " fill="none" id="16-to-19" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="593.95,1189.5799,586.9091,1182.6933,589.2637,1187.8368,584.1201,1190.1914,593.95,1189.5799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="1170.5999"/><!--MD5=[44ad4 [...]
+link 16 to 20--><path d="M513.82,1119.5999 C533.89,1119.5999 554.91,1119.5999 575.12,1119.5999 " fill="none" id="16-to-20" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="580.24,1119.5999,571.24,1115.5999,575.24,1119.5999,571.24,1123.5999,580.24,1119.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="1117.5999"/><!--MD5=[c81cc3f2353 [...]
+link 16 to 21--><path d="M474.62,1094.0499 C508.95,1081.2699 551.13,1065.5599 588.89,1051.4999 " fill="none" id="16-to-21" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="593.95,1049.6199,584.1201,1049.0084,589.2637,1051.3629,586.9091,1056.5065,593.95,1049.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="1065.5999"/><!--MD5=[fc5d0 [...]
+link 16 to 22--><path d="M429.27,1094.0999 C460.79,1060.5899 519.96,1001.3599 579,961.5999 C586.48,956.5599 594.53,951.7499 602.74,947.2199 " fill="none" id="16-to-22" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="607.32,944.7399,597.5026,945.5267,602.9278,947.1291,601.3254,952.5543,607.32,944.7399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
+link 23 to 24--><path d="M514.22,810.7599 C533.98,810.0599 554.65,809.3299 574.56,808.6199 " fill="none" id="23-to-24" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="579.6,808.4399,570.4577,804.7767,574.6034,808.6255,570.7547,812.7712,579.6,808.4399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="807.5999"/><!--MD5=[deed8cab30c10dbe2 [...]
+link 5 to 6--><path d="M510.61,689.5999 C532.61,689.5999 555.88,689.5999 578.08,689.5999 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="583.09,689.5999,574.09,685.5999,578.09,689.5999,574.09,693.5999,583.09,689.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="687.5999"/><!--MD5=[d626a4137f042c9ed96693ba9 [...]
+link 9 to 10--><path d="M508.21,564.5999 C531.75,564.5999 556.86,564.5999 580.62,564.5999 " fill="none" id="9-to-10" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="585.67,564.5999,576.67,560.5999,580.67,564.5999,576.67,568.5999,585.67,564.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="562.5999"/><!--MD5=[3a9de236b82b3780bb92df0 [...]
+link 9 to 11--><path d="M508.21,522.9199 C537.26,511.0699 568.7,498.2499 597.04,486.6899 " fill="none" id="9-to-11" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="601.93,484.6999,592.086,484.3912,597.2995,486.5863,595.1044,491.7999,601.93,484.6999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="505.5999"/><!--MD5=[5cad5af0897dff878c8 [...]
+link 12 to 13--><path d="M508.21,318.4599 C531.75,321.8799 556.86,325.5299 580.62,328.9899 " fill="none" id="12-to-13" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="585.67,329.7199,577.3346,324.4738,580.7214,329.0047,576.1904,332.3915,585.67,329.7199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="322.5999"/><!--MD5=[f674991f2698b6f [...]
+link 12 to 14--><path d="M508.21,276.7799 C531.75,270.5999 556.86,264.0099 580.62,257.7799 " fill="none" id="12-to-14" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="585.67,256.4499,575.9481,254.8734,580.8348,257.723,577.9852,262.6097,585.67,256.4499" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="548" y="264.5999"/><!--MD5=[1f1a23f512ee359f [...]
+link 12 to 15--><path d="M445,268.5199 C478.88,239.0899 530.07,197.0999 579,166.5999 C586.96,161.6399 595.46,156.8299 604.07,152.2599 " fill="none" id="12-to-15" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="608.87,149.7499,599.0409,150.3731,604.4386,152.0656,602.7461,157.4633,608.87,149.7499" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x=" [...]
+link 2 to 3--><path d="M135.04,840.2799 C144.48,926.6199 182.98,1212.4399 296,1415.5999 C312.12,1444.5799 337,1471.9899 358.82,1492.8799 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="362.57,1496.4299,358.7944,1487.3335,358.9429,1492.9884,353.288,1493.1369,362.57,1496.4299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0 [...]
+link 2 to 7--><path d="M144.29,840.5099 C170.76,898.5099 237.22,1043.0999 296,1162.5999 C327.65,1226.9399 366.46,1301.3799 387.88,1342.0899 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="390.4,1346.8899,389.7519,1337.0624,388.073,1342.4643,382.671,1340.7855,390.4,1346.8899" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0 [...]
+link 2 to 16--><path d="M155.41,840.3399 C205.58,896.6899 324.86,1030.6899 377.85,1090.2199 " fill="none" id="2-to-16" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="381.24,1094.0399,378.2682,1084.6501,377.9253,1090.2965,372.2788,1089.9536,381.24,1094.0399" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="265" y="960.5999"/><!--MD5=[0eceafed0c [...]
+link 2 to 23--><path d="M231.29,814.5999 C250.49,814.5999 270.77,814.5999 290.41,814.5999 " fill="none" id="2-to-23" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="295.66,814.5999,286.66,810.5999,290.66,814.5999,286.66,818.5999,295.66,814.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="265" y="812.5999"/><!--MD5=[4e74f4bf4b09d37138dfb3a [...]
+link 2 to 5--><path d="M188.1,788.9999 C220.75,773.9699 263.03,754.4999 301.51,736.7899 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="306.19,734.6299,296.3422,734.7754,301.6515,736.7279,299.699,742.0371,306.19,734.6299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="265" y="752.5999"/><!--MD5=[676073e7019c75b59fc2b [...]
+link 2 to 9--><path d="M150.34,789.0899 C178.2,750.5199 235.19,676.5899 296,626.5999 C301.83,621.7999 308.09,617.1599 314.54,612.7199 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.03,609.6799,309.3335,611.4055,314.8874,612.4797,313.8132,618.0336,319.03,609.6799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="26 [...]
+link 2 to 12--><path d="M145.7,788.9599 C173.3,735.4099 239.27,607.8699 296,501.5999 C325.33,446.6699 359.9,383.5699 381.88,343.6599 " fill="none" id="2-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="384.49,338.9099,376.6374,344.8544,382.0727,343.2867,383.6404,348.722,384.49,338.9099" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="265 [...]
 @startuml(id=Extensions)
 title Extensions - Containers
 caption Artifact Hierarchy (Maven)
@@ -222,7 +222,7 @@ package "Extensions\n[Software System]" {
 2 .[#707070].> 12 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg b/content/core/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg
index 4baf389..d6fe08b 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:244px;height:210px;" version="1.1" viewBox="0 0 244 210" width="244px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="172" x="29.5" y="18.9492">Keycl [...]
-cluster Keycloak\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,227,74.7383,227,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="56" x="47.5" y="47.6875">Keycloak</text><text fill="#000000" font-family="sans-serif" font [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="179" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="154" x="42" y="114.293">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="64" x="89.5" y="135.8867">Keycloak</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:254px;height:194px;" version="1.1" viewBox="0 0 254 194" width="254px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="176" x="32.5" y="17.9999">Keycl [...]
+cluster Keycloak\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,237,67.1997,237,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="63" x="52" y="43.5998">Keycloak</text><text fill="#000000" font-family="sans-serif" font-s [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="189" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="165" x="42" y="105.5999">Apache Isis Security -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="71" x="91" y="124.7999">Keycloak</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
 @startuml(id=Keycloak)
 title Keycloak - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Keycloak\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg b/content/core/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg
index 8f490a0..abdb138 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="882px" preserveAspectRatio="none" style="width:537px;height:882px;" version="1.1" viewBox="0 0 537 882" width="537px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="193" x="165.5" y="18.9492">Mave [...]
-cluster Mavendeps\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,520,74.7383,520,852.9492,16,852.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="72" x="39.5" y="47.6875">Mavendeps</text><text fill="#000000" font-family="sans-serif" fo [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="196" x="32" y="434.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="176" x="42" y="461.293">Apache Isis Maven Deps</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="117" x="71.5" y="476.5703">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="759.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="786.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="113" x="342" y="807.8867">BDD Integ Spec</text><text fill="#FFFFFE" font-family="s [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="647.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="674.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="132" x="332.5" y="695.8867">Integration Testing</text><text fill="#FFFFFE" font-fa [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="535.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="562.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="47" x="375" y="583.8867">JDK11</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-entity 6--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="450.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="28" x="384.5" y="471.8867">JDO</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="338.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="24" x="386.5" y="359.8867">JPA</text><text fill="#FFFFFE" font-family="sans-serif" [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="226.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="51" x="373" y="247.8867">Testing</text><text fill="#FFFFFE" font-family="sans-seri [...]
-entity 9--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="293" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="186" x="303" y="114.293">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="58" x="369.5" y="135.8867">Webapp</text><text fill="#FFFFFE" font-family="sans-seri [...]
-link 2 to 3--><path d="M140.97,489.5092 C161.78,543.8192 214.51,665.9792 293,741.9492 C298.29,747.0692 304.14,751.8492 310.29,756.2892 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="314.59,759.2992,309.5127,750.8599,310.4945,756.4309,304.9235,757.4127,314.59,759.2992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 4--><path d="M152.91,489.5192 C182.14,525.0892 236.78,587.4092 293,629.9492 C299.73,635.0392 306.98,639.9392 314.42,644.5692 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.07,647.4192,313.4939,639.3009,314.8093,644.8027,309.3075,646.1181,319.07,647.4192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 5--><path d="M196.53,489.4892 C228.02,502.7292 266.39,518.8492 301.12,533.4492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="305.78,535.3992,299.0375,528.2202,301.1718,533.4589,295.9331,535.5932,305.78,535.3992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262" y="513.4766"/><!--MD5=[8d5e64f07a3a0265301 [...]
-link 2 to 6--><path d="M228.34,461.9492 C247.59,461.9492 267.91,461.9492 287.54,461.9492 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="292.79,461.9492,283.79,457.9492,287.79,461.9492,283.79,465.9492,292.79,461.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262" y="458.4766"/><!--MD5=[f03a35d0a29bcf5b4caf40b6b [...]
-link 2 to 7--><path d="M196.53,434.4092 C228.02,421.1692 266.39,405.0492 301.12,390.4492 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="305.78,388.4992,295.9331,388.3052,301.1718,390.4395,299.0375,395.6783,305.78,388.4992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="262" y="404.4766"/><!--MD5=[0ad92ee86b71fc92e12 [...]
-link 2 to 8--><path d="M152.91,434.3792 C182.14,398.8092 236.78,336.4892 293,293.9492 C299.73,288.8592 306.98,283.9592 314.42,279.3292 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.07,276.4792,309.3075,277.7803,314.8093,279.0957,313.4939,284.5975,319.07,276.4792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 9--><path d="M140.97,434.3892 C161.78,380.0792 214.51,257.9192 293,181.9492 C298.29,176.8292 304.14,172.0492 310.29,167.6092 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="314.59,164.5992,304.9235,166.4857,310.4945,167.4675,309.5127,173.0385,314.59,164.5992" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="824px" preserveAspectRatio="none" style="width:555px;height:824px;" version="1.1" viewBox="0 0 555 824" width="555px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="196" x="173" y="17.9999">Mavend [...]
+cluster Mavendeps\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,538,67.1997,538,795.5999,16,795.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="79" x="44" y="43.5998">Mavendeps</text><text fill="#000000" font-family="sans-serif" font [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="208" x="32" y="404.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="188" x="42" y="430.0999">Apache Isis Maven Deps</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="120" x="76" y="443.2999">[Container: packaging: pom]</text><!--MD5=[5721696d2af8d327c8f4e7ea88061d17]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="709.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="735.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="121" x="353" y="754.7999">BDD Integ Spec</text><text fill="#FFFFFE" font-family=" [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="604.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="630.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="144" x="341.5" y="649.7999">Integration Testing</text><text fill="#FFFFFE" font-f [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="499.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="525.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="51" x="388" y="544.7999">JDK11</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 6--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="420.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="34" x="396.5" y="439.7999">JDO</text><text fill="#FFFFFE" font-family="sans-serif [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="315.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="31" x="398" y="334.7999">JPA</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="210.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="57" x="385" y="229.7999">Testing</text><text fill="#FFFFFE" font-family="sans-ser [...]
+entity 9--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="217" x="305" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="197" x="315" y="105.5999">Apache Isis Maven Deps -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="63" x="382" y="124.7999">Webapp</text><text fill="#FFFFFE" font-family="sans-serif [...]
+link 2 to 3--><path d="M147.69,455.1799 C170.08,506.1199 226.44,621.3899 305,691.5999 C311.1,697.0499 317.87,702.0799 324.95,706.6899 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="329.4,709.4999,323.9474,701.2981,325.1793,706.8192,319.6583,708.0512,329.4,709.4999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="274" [...]
+link 2 to 4--><path d="M159.82,455.1599 C190.45,488.4299 247.7,546.9899 305,586.5999 C312.73,591.9399 321.07,597.0499 329.57,601.8299 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="334.31,604.4599,328.3743,596.6007,329.9359,602.0377,324.4988,603.5993,334.31,604.4599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="27 [...]
+link 2 to 5--><path d="M204.04,455.1499 C237.58,467.9299 278.78,483.6399 315.68,497.6999 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="320.62,499.5799,313.623,492.6486,315.9448,497.807,310.7865,500.1289,320.62,499.5799" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="274" y="480.5999"/><!--MD5=[8d5e64f07a3a026530162 [...]
+link 2 to 6--><path d="M240.37,429.5999 C259.71,429.5999 280.02,429.5999 299.63,429.5999 " fill="none" id="2-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="304.87,429.5999,295.87,425.5999,299.87,429.5999,295.87,433.5999,304.87,429.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="274" y="427.5999"/><!--MD5=[f03a35d0a29bcf5b4caf40b6b [...]
+link 2 to 7--><path d="M204.04,404.0499 C237.58,391.2699 278.78,375.5599 315.68,361.4999 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="320.62,359.6199,310.7865,359.0709,315.9448,361.3927,313.623,366.5511,320.62,359.6199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="274" y="375.5999"/><!--MD5=[0ad92ee86b71fc92e123 [...]
+link 2 to 8--><path d="M159.48,404.0799 C189.96,370.5699 247.27,311.3199 305,271.5999 C312.35,266.5399 320.27,261.7199 328.35,257.1899 " fill="none" id="2-to-8" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="332.86,254.6999,323.0467,255.536,328.4798,257.1111,326.9047,262.5442,332.86,254.6999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="27 [...]
+link 2 to 9--><path d="M147.62,403.8699 C169.89,352.6399 226.02,236.7799 305,166.5999 C310.67,161.5699 316.91,156.9099 323.44,152.6199 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="328.01,149.7199,318.2683,151.1686,323.7893,152.4006,322.5574,157.9216,328.01,149.7199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
 @startuml(id=Mavendeps)
 title Mavendeps - Containers
 caption Artifact Hierarchy (Maven)
@@ -87,7 +87,7 @@ package "Mavendeps\n[Software System]" {
 2 .[#707070].> 9 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg b/content/core/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg
index 0a25bbc..e43b41b 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="210px" preserveAspectRatio="none" style="width:532px;height:210px;" version="1.1" viewBox="0 0 532 210" width="532px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="237" x="141" y="18.9492">Regres [...]
-cluster Regression Tests\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,515,74.7383,515,180.9492,16,180.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="106" x="22.5" y="47.6875">Regression Tests</text><text fill="#000000" font-family= [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="201" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="176" x="42" y="114.293">Apache Isis - Regression</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="38" x="113.5" y="135.8867">Tests</text><text fill="#FFFFFE" font-family="sans-serif"  [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="201" x="298" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="176" x="308" y="114.293">Apache Isis - Regression</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="97" x="350" y="135.8867">Tests (stable)</text><text fill="#FFFFFE" font-family="san [...]
-link 2 to 3--><path d="M233.31,125.9492 C252.74,125.9492 273.17,125.9492 292.76,125.9492 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="297.99,125.9492,288.99,121.9492,292.99,125.9492,288.99,129.9492,297.99,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="267" y="122.4766"/><text fill="#000000" font-family=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:558px;height:194px;" version="1.1" viewBox="0 0 558 194" width="558px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="243" x="151" y="17.9999">Regres [...]
+cluster Regression Tests\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,541,67.1997,541,165.5999,16,165.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="120" x="23.5" y="43.5998">Regression Tests</text><text fill="#000000" font-family= [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="214" x="32" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="42" y="105.5999">Apache Isis - Regression</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="42" x="118" y="124.7999">Tests</text><text fill="#FFFFFE" font-family="sans-serif" f [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="214" x="311" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="190" x="321" y="105.5999">Apache Isis - Regression</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="102" x="367" y="124.7999">Tests (stable)</text><text fill="#FFFFFE" font-family="s [...]
+link 2 to 3--><path d="M246.3,114.5999 C265.77,114.5999 286.14,114.5999 305.74,114.5999 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="310.98,114.5999,301.98,110.5999,305.98,114.5999,301.98,118.5999,310.98,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="280" y="112.5999"/><text fill="#000000" font-family="s [...]
 @startuml(id=Regression_Tests)
 title Regression Tests - Containers
 caption Artifact Hierarchy (Maven)
@@ -33,7 +33,7 @@ package "Regression Tests\n[Software System]" {
 2 .[#707070].> 3 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg b/content/core/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg
index 59a3b18..3975eb0 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:243px;height:188px;" version="1.1" viewBox="0 0 243 188" width="243px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="181" x="24.5" y="18.9492">Commo [...]
-cluster Commons\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,226,74.7383,226,158.9492,16,158.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="62" x="44.5" y="47.6875">Commons</text><text fill="#000000" font-family="sans-serif" font-s [...]
-entity 2--><rect fill="#438DD5" height="55.0898" style="stroke:#2E6295;stroke-width:1.5;" width="178" x="32" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="42" y="114.293">Apache Isis Commons</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="109" x="66.5" y="129.5703">[Container: packaging: jar]</text><text fill="#000000" font-family="sans-serif" fo [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="176px" preserveAspectRatio="none" style="width:257px;height:176px;" version="1.1" viewBox="0 0 257 176" width="257px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="185" x="29.5" y="17.9999">Commo [...]
+cluster Commons\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,240,67.1997,240,147.5999,16,147.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="71" x="48" y="43.5998">Commons</text><text fill="#000000" font-family="sans-serif" font-siz [...]
+entity 2--><rect fill="#438DD5" height="51.2" style="stroke:#2E6295;stroke-width:1.5;" width="192" x="32" y="80.0999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="172" x="42" y="106.0999">Apache Isis Commons</text><text fill="#FFFFFE" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="111" x="72.5" y="119.2999">[Container: packaging: jar]</text><text fill="#000000" font-family="sans-serif" font [...]
 @startuml(id=Commons)
 title Commons - Containers
 caption Artifact Hierarchy (Maven)
@@ -24,7 +24,7 @@ package "Commons\n[Software System]" {
 }
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg b/content/core/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg
index a67fb79..77d3ff4 100644
--- a/content/core/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="546px" preserveAspectRatio="none" style="width:787px;height:546px;" version="1.1" viewBox="0 0 787 546" width="787px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="166" x="304" y="18.9492">Asciid [...]
-cluster Asciidoc\n[Software System]--><polygon fill="#FFFFFF" points="16,30.9492,133,30.9492,140,74.7383,770,74.7383,770,516.9492,16,516.9492,16,30.9492" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="140" y1="74.7383" y2="74.7383"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="50" y="47.6875">Asciidoc</text><text fill="#000000" font-family="sans-serif" font-s [...]
-entity 4--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="193" x="276.5" y="423.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="311" y="450.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="173" x="286.5" y="471.8867">Asciidoctor (MetaModel)</text><text fill="#FFFFFE" font-fam [...]
-entity 5--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="196" x="275" y="311.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="311" y="338.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="176" x="285" y="359.8867">Asciidoctor (Persistence)</text><text fill="#FFFFFE" font-famil [...]
-entity 3--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="157" x="294.5" y="199.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="311" y="226.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="137" x="304.5" y="247.8867">Asciidoctor (applib)</text><text fill="#FFFFFE" font-family [...]
-entity 2--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="159" x="41.5" y="249.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="59" y="276.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="139" x="51.5" y="297.8867">Asciidoctor (parent)</text><text fill="#FFFFFE" font-family="s [...]
-entity 6--><rect fill="#438DD5" height="98.2773" style="stroke:#2E6295;stroke-width:1.5;" width="218" x="536" y="300.9492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="583" y="327.793">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="198" x="546" y="349.3867">Asciidoctor (persistence jdo</text><text fill="#FFFFFE" font-fa [...]
-entity 8--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="178" x="32" y="388.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="59" y="415.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="158" x="42" y="436.8867">Asciidoctor (ui vaadin)</text><text fill="#FFFFFE" font-family="sa [...]
-entity 9--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="176" x="557" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="583" y="114.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="156" x="567" y="135.8867">Asciidoctor (ui wicket)</text><text fill="#FFFFFE" font-family=" [...]
-entity 7--><rect fill="#438DD5" height="76.6836" style="stroke:#2E6295;stroke-width:1.5;" width="144" x="301" y="87.4492"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="119" x="311" y="114.293">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="106" x="320" y="135.8867">Asciidoctor (ui)</text><text fill="#FFFFFE" font-family="sans-se [...]
-link 5 to 6--><path d="M471.09,349.9492 C490.47,349.9492 510.97,349.9492 530.83,349.9492 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="535.87,349.9492,526.87,345.9492,530.87,349.9492,526.87,353.9492,535.87,349.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="505" y="346.4766"/><!--MD5=[d209f2622dd5d3103b9c9b467 [...]
-link 2 to 4--><path d="M168.69,326.5692 C198.39,350.4692 238.07,381.2092 275,405.9492 C282.43,410.9292 290.32,415.9192 298.26,420.7692 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="302.68,423.4492,297.0522,415.3666,298.4027,420.8599,292.9094,422.2104,302.68,423.4492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 5--><path d="M200.76,307.4792 C222.67,312.9192 246.79,318.8992 269.84,324.6092 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="274.74,325.8292,266.9621,319.7874,269.8859,324.63,265.0433,327.5538,274.74,325.8292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="244" y="315.4766"/><!--MD5=[eeb69082328d10abd3b14 [...]
-link 2 to 3--><path d="M200.76,272.1992 C229.04,266.5392 260.99,260.1492 289.57,254.4392 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="294.49,253.4492,284.884,251.2758,289.5855,254.4215,286.4397,259.123,294.49,253.4492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="244" y="260.4766"/><!--MD5=[f03a35d0a29bcf5b4caf4 [...]
-link 2 to 7--><path d="M175.44,249.3192 C204.5,228.7292 241.29,203.3092 275,181.9492 C282.69,177.0792 290.82,172.1092 298.96,167.2492 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="303.48,164.5692,293.7,165.7314,299.1825,167.1249,297.789,172.6074,303.48,164.5692" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="244" y [...]
-link 7 to 9--><path d="M445.29,125.9492 C477.9,125.9492 516.95,125.9492 551.77,125.9492 " fill="none" id="7-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="556.87,125.9492,547.87,121.9492,551.87,125.9492,547.87,129.9492,556.87,125.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="505" y="122.4766"/><text fill="#000000" font-family="s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:805px;height:509px;" version="1.1" viewBox="0 0 805 509" width="805px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="170" x="311" y="17.9999">Asciid [...]
+cluster Asciidoc\n[Software System]--><polygon fill="#FFFFFF" points="16,27.5999,149,27.5999,156,67.1997,788,67.1997,788,480.5999,16,480.5999,16,27.5999" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="156" y1="67.1997" y2="67.1997"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="60" x="53.5" y="43.5998">Asciidoc</text><text fill="#000000" font-family="sans-serif" font [...]
+entity 4--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="205" x="290" y="394.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="327.5" y="420.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="185" x="300" y="439.7999">Asciidoctor (MetaModel)</text><text fill="#FFFFFE" font-fami [...]
+entity 5--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="211" x="287" y="289.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="327.5" y="315.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="191" x="297" y="334.7999">Asciidoctor (Persistence)</text><text fill="#FFFFFE" font-fa [...]
+entity 3--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="168" x="308.5" y="184.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="327.5" y="210.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="148" x="318.5" y="229.7999">Asciidoctor (applib)</text><text fill="#FFFFFE" font-fam [...]
+entity 2--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="170" x="42" y="250.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="62" y="276.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="150" x="52" y="295.7999">Asciidoctor (parent)</text><text fill="#FFFFFE" font-family="sans [...]
+entity 6--><rect fill="#438DD5" height="89.6001" style="stroke:#2E6295;stroke-width:1.5;" width="209" x="563" y="279.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="602.5" y="305.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="185" x="573" y="324.7999">Asciidoctor (persistence</text><text fill="#FFFFFE" font-fam [...]
+entity 8--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="190" x="32" y="368.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="62" y="394.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="170" x="42" y="413.7999">Asciidoctor (ui vaadin)</text><text fill="#FFFFFE" font-family="s [...]
+entity 9--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="187" x="574" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="602.5" y="105.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="167" x="584" y="124.7999">Asciidoctor (ui wicket)</text><text fill="#FFFFFE" font-famil [...]
+entity 7--><rect fill="#438DD5" height="70.4001" style="stroke:#2E6295;stroke-width:1.5;" width="150" x="317.5" y="79.5999"/><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="126" x="327.5" y="105.5999">Apache Isis Val -</text><text fill="#FFFFFE" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="115" x="335" y="124.7999">Asciidoctor (ui)</text><text fill="#FFFFFE" font-family="sa [...]
+link 5 to 6--><path d="M498.27,324.5999 C517.65,324.5999 537.93,324.5999 557.43,324.5999 " fill="none" id="5-to-6" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="562.91,324.5999,553.91,320.5999,557.91,324.5999,553.91,328.5999,562.91,324.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="532" y="322.5999"/><!--MD5=[d209f2622dd5d3103b9c9b467 [...]
+link 2 to 4--><path d="M186.77,320.7899 C216.55,338.3099 253.43,359.5599 287,377.5999 C295.97,382.4199 305.45,387.3599 314.89,392.1699 " fill="none" id="2-to-4" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="319.52,394.5299,313.3174,386.8795,315.0651,392.2596,309.685,394.0073,319.52,394.5299" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="25 [...]
+link 2 to 5--><path d="M212.1,298.0499 C234.31,301.3399 258.62,304.9299 281.97,308.3899 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="286.93,309.1199,278.6244,303.8267,281.9855,308.3768,277.4355,311.7379,286.93,309.1199" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256" y="302.5999"/><!--MD5=[eeb69082328d10abd3b1 [...]
+link 2 to 3--><path d="M212.1,264.5399 C241.14,257.2599 273.76,249.0899 303.14,241.7299 " fill="none" id="2-to-3" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="308.2,240.4599,298.4986,238.7621,303.3493,241.6725,300.4389,246.5233,308.2,240.4599" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256" y="251.5999"/><!--MD5=[f03a35d0a29bcf5b4caf40 [...]
+link 2 to 7--><path d="M170.37,250.5699 C201.58,225.6099 245.61,192.0999 287,166.5999 C295.08,161.6199 303.7,156.7299 312.39,152.0499 " fill="none" id="2-to-7" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="317.23,149.4699,307.4068,150.1807,312.8194,151.825,311.1751,157.2376,317.23,149.4699" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="256 [...]
+link 7 to 9--><path d="M467.74,114.5999 C498.84,114.5999 535.42,114.5999 568.67,114.5999 " fill="none" id="7-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="573.98,114.5999,564.98,110.5999,568.98,114.5999,564.98,118.5999,573.98,114.5999" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="532" y="112.5999"/><text fill="#000000" font-family=" [...]
 @startuml(id=Asciidoc)
 title Asciidoc - Containers
 caption Artifact Hierarchy (Maven)
@@ -85,7 +85,7 @@ package "Asciidoc\n[Software System]" {
 7 .[#707070].> 9 : ""
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/_overview/about.html b/content/core/2.0.0-M5/_overview/about.html
index 071e974..ed9150e 100644
--- a/content/core/2.0.0-M5/_overview/about.html
+++ b/content/core/2.0.0-M5/_overview/about.html
@@ -1206,173 +1206,6 @@ Directory: /examples/demo/domain</code></pre>
 </div></div></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="sidebarblock">
 <div class="content">
-<div class="title">Components</div>
-<div class="paragraph">
-<p>demoapp.dom.AppConfiguration<br>
-demoapp.dom._infra.DefaultTitleProvider<br>
-demoapp.dom._infra.LibraryPreloadingService<br>
-demoapp.dom._infra.fixtures.DemoFixtureScriptSpecificationProvider<br>
-demoapp.dom._infra.resources.AsciiDocConverterService<br>
-demoapp.dom._infra.resources.AsciiDocReaderService<br>
-demoapp.dom._infra.resources.MarkdownReaderService<br>
-demoapp.dom._infra.resources.MarkupReaderService<br>
-demoapp.dom._infra.resources.MarkupVariableResolverService<br>
-demoapp.dom._infra.resources.ResourceReaderService<br>
-demoapp.dom._infra.samples.NameSamples<br>
-demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory<br>
-demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory<br>
-demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault<br>
-demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory<br>
-demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoEntities<br>
-demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoSeedService<br>
-demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoEntities<br>
-demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoSeedService<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoEntities<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoSeedService<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoEntities<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoSeedService<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoSeedService<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities<br>
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoSeedService<br>
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.ChildJdoEntities<br>
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.seed.ChildJdoSeedService<br>
-demoapp.dom.domain.objects.other.embedded.NumberConstantJdoRepository<br>
-demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoEntities<br>
-demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoSeedService<br>
-demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoEntities<br>
-demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoSeedService<br>
-demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities<br>
-demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoSeedService<br>
-demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService<br>
-demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback<br>
-demoapp.dom.featured.customui.geocoding.GeoapifyClient<br>
-demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation<br>
-demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository<br>
-demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation<br>
-demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoEntities<br>
-demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoSeedService<br>
-demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo<br>
-demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdoEntities<br>
-demoapp.dom.services.extensions.secman.apptenancy.entities.seed.TenantedJdoSeedService<br>
-demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities<br>
-demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoSeedService<br>
-demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples<br>
-demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities<br>
-demoapp.dom.types.isis.clobs.jdo.IsisClobJdoSeedService<br>
-demoapp.dom.types.isis.clobs.samples.IsisClobsSamples<br>
-demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities<br>
-demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoSeedService<br>
-demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples<br>
-demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities<br>
-demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoSeedService<br>
-demoapp.dom.types.isis.markups.samples.IsisMarkupSamples<br>
-demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities<br>
-demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoSeedService<br>
-demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples<br>
-demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities<br>
-demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoSeedService<br>
-demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples<br>
-demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities<br>
-demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoSeedService<br>
-demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples<br>
-demoapp.dom.types.javaawt.images.jdo.JavaAwtImageJdoEntities<br>
-demoapp.dom.types.javaawt.images.jdo.JavaAwtImageJdoSeedService<br>
-demoapp.dom.types.javaawt.images.samples.JavaAwtImageService<br>
-demoapp.dom.types.javaawt.images.samples.JavaAwtImagesSamples<br>
-demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities<br>
-demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoSeedService<br>
-demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples<br>
-demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities<br>
-demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoSeedService<br>
-demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples<br>
-demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities<br>
-demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoSeedService<br>
-demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples<br>
-demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities<br>
-demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoSeedService<br>
-demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples<br>
-demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities<br>
-demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoSeedService<br>
-demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples<br>
-demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities<br>
-demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoSeedService<br>
-demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples<br>
-demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities<br>
-demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoSeedService<br>
-demoapp.dom.types.javalang.longs.samples.WrapperLongSamples<br>
-demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities<br>
-demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoSeedService<br>
-demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples<br>
-demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities<br>
-demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoSeedService<br>
-demoapp.dom.types.javalang.strings.samples.JavaLangStringSamples<br>
-demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities<br>
-demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoSeedService<br>
-demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples<br>
-demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities<br>
-demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoSeedService<br>
-demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples<br>
-demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities<br>
-demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoSeedService<br>
-demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples<br>
-demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities<br>
-demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoSeedService<br>
-demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples<br>
-demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities<br>
-demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoSeedService<br>
-demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples<br>
-demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities<br>
-demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoSeedService<br>
-demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples<br>
-demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities<br>
-demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoSeedService<br>
-demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples<br>
-demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities<br>
-demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoSeedService<br>
-demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples<br>
-demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities<br>
-demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoSeedService<br>
-demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples<br>
-demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities<br>
-demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoSeedService<br>
-demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples<br>
-demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities<br>
-demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoSeedService<br>
-demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples<br>
-demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities<br>
-demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoSeedService<br>
-demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples<br>
-demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities<br>
-demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoSeedService<br>
-demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples<br>
-demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities<br>
-demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoSeedService<br>
-demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples<br>
-demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities<br>
-demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoSeedService<br>
-demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples<br>
-demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities<br>
-demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoSeedService<br>
-demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities<br>
-demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoSeedService<br>
-demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities<br>
-demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoSeedService<br>
-demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities<br>
-demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoSeedService<br>
-demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities<br>
-demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoSeedService<br>
-demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities<br>
-demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoSeedService<br>
-demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities<br>
-demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoSeedService<br>
-demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities<br>
-demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoSeedService<br></p>
-</div>
-</div>
-</div>
-<div class="sidebarblock">
-<div class="content">
 <div class="title">Dependencies</div>
 <div class="paragraph">
 <p>com.h2database:h2:jar:&lt;managed&gt;<br>
@@ -1470,14 +1303,6 @@ Directory: /examples/demo/web</code></pre>
 </div></div></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="sidebarblock">
 <div class="content">
-<div class="title">Components</div>
-<div class="paragraph">
-<p>demoapp.web._infra.utils.ThereCanBeOnlyOne<br></p>
-</div>
-</div>
-</div>
-<div class="sidebarblock">
-<div class="content">
 <div class="title">Dependencies</div>
 <div class="paragraph">
 <p>org.apache.isis.examples.apps:demo-domain:jar:${project.version}<br>
@@ -1506,14 +1331,6 @@ Directory: /examples/demo/wicket</code></pre>
 </div></div></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="sidebarblock">
 <div class="content">
-<div class="title">Components</div>
-<div class="paragraph">
-<p>demoapp.webapp.wicket.ui.custom.WhereInTheWorldPanelFactory<br></p>
-</div>
-</div>
-</div>
-<div class="sidebarblock">
-<div class="content">
 <div class="title">Dependencies</div>
 <div class="paragraph">
 <p>org.apache.isis.examples.apps:demo-web:jar:${project.version}<br>
@@ -3354,7 +3171,7 @@ org.datanucleus:javax.jdo:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.html" class="page">IsisModuleViewerRestfulObjectsViewer</a></p>
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.html" class="page">IsisModuleViewerRestfulObjectsViewer</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/viewer/webmodule/auth/AuthenticationStrategy.html" class="page">AuthenticationStrategy</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyAbstract.html" class="page">AuthenticationStrategyAbstra [...]
 </div>
 </div>
 </div></div></td>
@@ -5320,6 +5137,7 @@ o.a.i.extensions.commandreplay.secondary.fetch.CommandFetcher<br></p>
 org.apache.isis.core:isis-core-internaltestsupport:jar:&lt;managed&gt;<br>
 org.apache.isis.core:isis-core-runtime:jar:&lt;managed&gt;<br>
 org.apache.isis.core:isis-schema:jar:&lt;managed&gt;<br>
+org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:&lt;managed&gt;<br>
 org.apache.isis.extensions:isis-extensions-quartz-impl:jar:&lt;managed&gt;<br>
 org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:&lt;managed&gt;<br>
 org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:&lt;managed&gt;<br>
@@ -5458,7 +5276,6 @@ Directory: /extensions/core/quartz/impl</code></pre>
 <div class="paragraph">
 <p>org.apache.isis.core:isis-core-config:jar:&lt;managed&gt;<br>
 org.apache.isis.core:isis-core-security:jar:&lt;managed&gt;<br>
-org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:&lt;managed&gt;<br>
 org.springframework.boot:spring-boot-starter-quartz:jar:&lt;managed&gt;<br></p>
 </div>
 </div>
@@ -6466,26 +6283,6 @@ Directory: /regressiontests/stable</code></pre>
 </div></div></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="sidebarblock">
 <div class="content">
-<div class="title">Components</div>
-<div class="paragraph">
-<p>o.a.i.testdomain.applayer.ApplicationLayerTestFactory<br>
-o.a.i.testdomain.applayer.ApplicationLayerTestFactory$PreCommitListener<br>
-o.a.i.testdomain.applayer.publishing.CommandSubscriberForTesting<br>
-o.a.i.testdomain.applayer.publishing.EntityChangesSubscriberForTesting<br>
-o.a.i.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting<br>
-o.a.i.testdomain.applayer.publishing.ExecutionSubscriberForTesting<br>
-o.a.i.testdomain.conf.Configuration_headless$HeadlessCommandSupport<br>
-o.a.i.testdomain.jdo.JdoInventoryDao<br>
-o.a.i.testdomain.jpa.JpaInventoryDao<br>
-o.a.i.testdomain.jpa.springdata.EmployeeRepository<br>
-o.a.i.testdomain.util.interaction.InteractionBoundaryProbe<br>
-o.a.i.testdomain.util.kv.KVStoreForTesting<br>
-o.a.i.testdomain.util.rest.RestEndpointService<br></p>
-</div>
-</div>
-</div>
-<div class="sidebarblock">
-<div class="content">
 <div class="title">Dependencies</div>
 <div class="paragraph">
 <p>org.apache.isis.extensions:isis-extensions-cors-impl:jar:&lt;managed&gt;<br>
@@ -6661,32 +6458,6 @@ Directory: /incubator/viewers/javafx/ui</code></pre>
 </div></div></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="sidebarblock">
 <div class="content">
-<div class="title">Components</div>
-<div class="paragraph">
-<p>o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx<br>
-o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory<br>
-o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory<br>
-o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory<br>
-o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory<br>
-o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory<br>
-o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField<br>
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider<br>
-o.a.i.incubator.viewer.javafx.ui.main.MainViewFx<br>
-o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx<br>
-o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx<br>
-o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault<br></p>
-</div>
-</div>
-</div>
-<div class="sidebarblock">
-<div class="content">
 <div class="title">Dependencies</div>
 <div class="paragraph">
 <p>org.apache.isis.core:isis-core-runtimeservices:jar:&lt;managed&gt;<br>
@@ -7076,7 +6847,7 @@ org.datanucleus:javax.jdo:jar:&lt;managed&gt;<br></p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/about.html b/content/core/2.0.0-M5/about.html
index c3b8587..8d7bb2e 100644
--- a/content/core/2.0.0-M5/about.html
+++ b/content/core/2.0.0-M5/about.html
@@ -432,7 +432,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/archdesign/about.html b/content/core/2.0.0-M5/archdesign/about.html
index 607fc37..38eb7f5 100644
--- a/content/core/2.0.0-M5/archdesign/about.html
+++ b/content/core/2.0.0-M5/archdesign/about.html
@@ -456,7 +456,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/codegen-bytebuddy/about.html b/content/core/2.0.0-M5/codegen-bytebuddy/about.html
index b74e630..41dd69f 100644
--- a/content/core/2.0.0-M5/codegen-bytebuddy/about.html
+++ b/content/core/2.0.0-M5/codegen-bytebuddy/about.html
@@ -423,7 +423,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/commons/about.html b/content/core/2.0.0-M5/commons/about.html
index a29d48f..00bf85a 100644
--- a/content/core/2.0.0-M5/commons/about.html
+++ b/content/core/2.0.0-M5/commons/about.html
@@ -500,7 +500,7 @@ because these may be changed or removed without notice!
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html b/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html
index cb1f793..12405ef 100644
--- a/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html
+++ b/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html
@@ -497,7 +497,7 @@ I&#8217;ve recently learned, that with newer JDKs (unfortunately not in 8) one c
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/interaction/about.html b/content/core/2.0.0-M5/interaction/about.html
index 57b9624..de086d5 100644
--- a/content/core/2.0.0-M5/interaction/about.html
+++ b/content/core/2.0.0-M5/interaction/about.html
@@ -421,7 +421,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/internaltestsupport/about.html b/content/core/2.0.0-M5/internaltestsupport/about.html
index 580718d..d1e7d54 100644
--- a/content/core/2.0.0-M5/internaltestsupport/about.html
+++ b/content/core/2.0.0-M5/internaltestsupport/about.html
@@ -421,7 +421,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/metamodel/_images/diag-7970de82f6aafe36a3bb869359f7e05e01e6a375.svg b/content/core/2.0.0-M5/metamodel/_images/diag-7970de82f6aafe36a3bb869359f7e05e01e6a375.svg
index 3e7d7d7..442ab81 100644
--- a/content/core/2.0.0-M5/metamodel/_images/diag-7970de82f6aafe36a3bb869359f7e05e01e6a375.svg
+++ b/content/core/2.0.0-M5/metamodel/_images/diag-7970de82f6aafe36a3bb869359f7e05e01e6a375.svg
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="729px" preserveAspectRatio="none" style="width:727px;height:729px;" version="1.1" viewBox="0 0 727 729" width="727px" zoomAndPan="magnify"><defs><filter height="300%" id="f1q9c7x0ueqiwj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorM [...]
-cluster metamodel--><polygon fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" points="16,6.6563,91,6.6563,98,31.5508,544,31.5508,544,722.6563,16,722.6563,16,6.6563" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="98" y1="31.5508" y2="31.5508"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="20" y="23.3945">metamodel</text><!--MD5=[58f92eeca1b9b283e19d96b306260adc]
-cluster runtime--><polygon fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" points="568,26.1563,620,26.1563,627,51.0508,710,51.0508,710,293.1563,568,293.1563,568,26.1563" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="568" x2="627" y1="51.0508" y2="51.0508"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="572" y="42.8945">runtime</text><!--MD5=[9bd84f0cda9d158e3d4f78628a93cd60]
-class Object\nSpecId--><rect codeLine="21" fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" height="81.4316" id="Object\nSpecId" style="stroke:#A80036;stroke-width:1.5;" width="66" x="301" y="43.6563"/><ellipse cx="316" cy="72.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M311.9375,73.0898 Q311.9375,69.6367 313.0313,68.0117 Q314.1406,66.3711 316.3594,66.3711 Q317.5625,66.3711 318.8281,67.0273 L318.8281,69.0742 Q317.375,68.293 316.4375,68.293 Q313.984 [...]
-class Object\nSpecification--><rect codeLine="25" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="104.2773" id="Object\nSpecification" style="stroke:#A80036;stroke-width:1.5;" width="145" x="100.5" y="184.6563"/><ellipse cx="136.65" cy="213.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M132.5875,214.0898 Q132.5875,210.6367 133.6813,209.0117 Q134.7906,207.3711 137.0094,207.3711 Q138.2125,207.3711 139.4781,208.0273 L139.4781,210.0742 Q138.025, [...]
-class Object\nMember--><rect codeLine="31" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="Object\nMember" style="stroke:#A80036;stroke-width:1.5;" width="74" x="148" y="409.6563"/><ellipse cx="163" cy="438.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M158.9375,439.0898 Q158.9375,435.6367 160.0313,434.0117 Q161.1406,432.3711 163.3594,432.3711 Q164.5625,432.3711 165.8281,433.0273 L165.8281,435.0742 Q164.375,434.293 163.4375,434. [...]
-class Object\nAction--><rect codeLine="35" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="Object\nAction" style="stroke:#A80036;stroke-width:1.5;" width="65" x="158.5" y="528.6563"/><ellipse cx="173.5" cy="557.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M169.4375,558.0898 Q169.4375,554.6367 170.5313,553.0117 Q171.6406,551.3711 173.8594,551.3711 Q175.0625,551.3711 176.3281,552.0273 L176.3281,554.0742 Q174.875,553.293 173.9375, [...]
-class Object\nAssociation--><rect codeLine="39" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="Object\nAssociation" style="stroke:#A80036;stroke-width:1.5;" width="91" x="32.5" y="528.6563"/><ellipse cx="47.5" cy="557.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M43.4375,558.0898 Q43.4375,554.6367 44.5313,553.0117 Q45.6406,551.3711 47.8594,551.3711 Q49.0625,551.3711 50.3281,552.0273 L50.3281,554.0742 Q48.875,553.293 47.9375,55 [...]
-class OneToOne\nAssociation--><rect codeLine="43" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="OneToOne\nAssociation" style="stroke:#A80036;stroke-width:1.5;" width="91" x="32.5" y="647.6563"/><ellipse cx="47.5" cy="676.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M43.4375,677.0898 Q43.4375,673.6367 44.5313,672.0117 Q45.6406,670.3711 47.8594,670.3711 Q49.0625,670.3711 50.3281,671.0273 L50.3281,673.0742 Q48.875,672.293 47.937 [...]
-class OneToMany\nAssociation--><rect codeLine="47" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="OneToMany\nAssociation" style="stroke:#A80036;stroke-width:1.5;" width="91" x="158.5" y="647.6563"/><ellipse cx="173.5" cy="676.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M169.4375,677.0898 Q169.4375,673.6367 170.5313,672.0117 Q171.6406,670.3711 173.8594,670.3711 Q175.0625,670.3711 176.3281,671.0273 L176.3281,673.0742 Q174.875,6 [...]
-class FacetHolder--><rect codeLine="51" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="42.3906" id="FacetHolder" style="stroke:#A80036;stroke-width:1.5;" width="93" x="280.5" y="215.6563"/><ellipse cx="295.5" cy="236.8516" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M298.1563,243.0547 L292.0313,243.0547 L292.0313,241.1641 L294.0313,241.1641 L294.0313,231.8359 L292.0313,231.8359 L292.0313,229.9453 L298.1563,229.9453 L298.1563,231.8359 L296.1563, [...]
-class Object\nActionParameter--><rect codeLine="54" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="Object\nActionParameter" style="stroke:#A80036;stroke-width:1.5;" width="117" x="263.5" y="409.6563"/><ellipse cx="278.5" cy="438.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M274.4375,439.0898 Q274.4375,435.6367 275.5313,434.0117 Q276.6406,432.3711 278.8594,432.3711 Q280.0625,432.3711 281.3281,433.0273 L281.3281,435.0742 Q279.87 [...]
-class OneToOne\nActionParameter--><rect codeLine="57" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="OneToOne\nActionParameter" style="stroke:#A80036;stroke-width:1.5;" width="117" x="258.5" y="528.6563"/><ellipse cx="273.5" cy="557.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M269.4375,558.0898 Q269.4375,554.6367 270.5313,553.0117 Q271.6406,551.3711 273.8594,551.3711 Q275.0625,551.3711 276.3281,552.0273 L276.3281,554.0742 Q27 [...]
-class Facet--><rect codeLine="60" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="42.3906" id="Facet" style="stroke:#A80036;stroke-width:1.5;" width="62" x="408" y="215.6563"/><ellipse cx="423" cy="236.8516" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M425.6563,243.0547 L419.5313,243.0547 L419.5313,241.1641 L421.5313,241.1641 L421.5313,231.8359 L419.5313,231.8359 L419.5313,229.9453 L425.6563,229.9453 L425.6563,231.8359 L423.6563,231.8359 L423.65 [...]
-class OneToMany\nActionParameter--><rect codeLine="63" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="58.5859" id="OneToMany\nActionParameter" style="stroke:#A80036;stroke-width:1.5;" width="117" x="410.5" y="528.6563"/><ellipse cx="425.5" cy="557.9492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M421.4375,558.0898 Q421.4375,554.6367 422.5313,553.0117 Q423.6406,551.3711 425.8594,551.3711 Q427.0625,551.3711 428.3281,552.0273 L428.3281,554.0742 Q [...]
-class Object\nAdapter--><rect codeLine="68" fill="#90EE90" filter="url(#f1q9c7x0ueqiwj)" height="81.4316" id="Object\nAdapter" style="stroke:#A80036;stroke-width:1.5;" width="111" x="583.5" y="196.1563"/><ellipse cx="616.5" cy="225.4492" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M612.4375,225.5898 Q612.4375,222.1367 613.5313,220.5117 Q614.6406,218.8711 616.8594,218.8711 Q618.0625,218.8711 619.3281,219.5273 L619.3281,221.5742 Q617.875,220.793 616.93 [...]
-class Oid--><rect codeLine="71" fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" height="42.3906" id="Oid" style="stroke:#A80036;stroke-width:1.5;" width="64" x="595" y="63.1563"/><ellipse cx="610" cy="84.3516" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M605.9375,84.4922 Q605.9375,81.0391 607.0313,79.4141 Q608.1406,77.7734 610.3594,77.7734 Q611.5625,77.7734 612.8281,78.4297 L612.8281,80.4766 Q611.375,79.6953 610.4375,79.6953 Q607.9844,79.6953 607.9844,8 [...]
-reverse link Object\nSpecId to Object\nSpecification--><path codeLine="78" d="M296.88,119.8563 C276.42,138.9863 250.62,163.1063 227.87,184.3663 " fill="none" id="Object\nSpecId-backto-Object\nSpecification" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="300.64,116.3362,291.3317,119.5542,296.9852,119.7483,296.791,125.4019,300.64,116.3362" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ed7878ac517ae046682c90f495e7c07d]
-link Object\nSpecification to Object\nMember--><path codeLine="79" d="M176.06,288.7663 C178.23,324.9663 181.07,372.5063 182.96,404.1363 " fill="none" id="Object\nSpecification-to-Object\nMember" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="183.28,409.4563,186.7322,400.2322,182.9797,404.4653,178.7467,400.7128,183.28,409.4563" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength [...]
-reverse link Object\nMember to Object\nAssociation--><path codeLine="80" d="M145.21,483.6663 C131.54,498.6063 116.6,514.9563 104.28,528.4263 " fill="none" id="Object\nMember-backto-Object\nAssociation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="140.16,478.8163,158.82,468.7763,150.49,488.2563,140.16,478.8163" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[241503ab21274031e0e27ca51ddcf3f4]
-reverse link Object\nMember to Object\nAction--><path codeLine="81" d="M187.5,488.9063 C188.19,502.3563 188.92,516.5163 189.53,528.4263 " fill="none" id="Object\nMember-backto-Object\nAction" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="180.5,489.1063,186.47,468.7763,194.48,488.3963,180.5,489.1063" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b1dd17f101192166ad8ece1c1058fee]
-reverse link Object\nAssociation to OneToOne\nAssociation--><path codeLine="82" d="M78,607.9063 C78,621.3563 78,635.5163 78,647.4263 " fill="none" id="Object\nAssociation-backto-OneToOne\nAssociation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="71,607.7763,78,587.7763,85,607.7763,71,607.7763" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c4d38020f98201eb2fe41c2e8b25f5c7]
-reverse link Object\nAssociation to OneToMany\nAssociation--><path codeLine="83" d="M123.59,601.4863 C140.02,616.7463 158.17,633.5963 173.06,647.4263 " fill="none" id="Object\nAssociation-backto-OneToMany\nAssociation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.72,606.5163,108.82,587.7763,128.24,596.2563,118.72,606.5163" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[fed48b2c8a9a486fb23584c154f1ec15]
-reverse link Object\nActionParameter to OneToOne\nActionParameter--><path codeLine="84" d="M319.92,488.9063 C319.34,502.3563 318.74,516.5163 318.23,528.4263 " fill="none" id="Object\nActionParameter-backto-OneToOne\nActionParameter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="312.93,488.4563,320.78,468.7763,326.92,489.0563,312.93,488.4563" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6af0f7e8de7c83f30bca28014b14a2cb]
-reverse link Object\nActionParameter to OneToMany\nActionParameter--><path codeLine="85" d="M373.78,481.3663 C393.41,496.9963 415.31,514.4263 433.16,528.6263 " fill="none" id="Object\nActionParameter-backto-OneToMany\nActionParameter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="369.25,486.7063,357.96,468.7763,377.97,475.7563,369.25,486.7063" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b2b29efb307806de1bba54f1e5dc2be6]
-reverse link Object\nActionParameter to Object\nAction--><path codeLine="86" d="M286.08,472.2363 C266.41,489.8063 242.22,511.4063 223.17,528.4263 " fill="none" id="Object\nActionParameter-backto-Object\nAction" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="289.95,468.7763,280.5723,471.7859,286.2201,472.106,285.8999,477.7538,289.95,468.7763" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spac [...]
-link Object\nSpecification to FacetHolder--><path codeLine="88" d="M245.79,236.6563 C250.56,236.6563 255.33,236.6563 260.11,236.6563 " fill="none" id="Object\nSpecification-to-FacetHolder" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="260.37,229.6563,280.37,236.6563,260.37,243.6563,260.37,229.6563" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7ed1b40c9d8e1ede63264d1d3150c096]
-reverse link FacetHolder to Object\nMember--><path codeLine="89" d="M300.97,274.4063 C273.43,313.3063 230.53,373.8763 205.35,409.4263 " fill="none" id="FacetHolder-backto-Object\nMember" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="295.33,270.2563,312.6,257.9863,306.76,278.3563,295.33,270.2563" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6d10f057513b3b6ea03cfbefdadc4b76]
-reverse link FacetHolder to Object\nActionParameter--><path codeLine="90" d="M325.99,278.1563 C325.02,317.1063 323.57,374.9963 322.72,409.4263 " fill="none" id="FacetHolder-backto-Object\nActionParameter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="319,277.8063,326.49,257.9863,332.99,278.1563,319,277.8063" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[78d434f5ba83524917ac2512edcf96ee]
-link FacetHolder to Facet--><path codeLine="91" d="M373.81,236.6563 C383.5,236.6563 393.18,236.6563 402.87,236.6563 " fill="none" id="FacetHolder-to-Facet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="407.93,236.6563,398.93,232.6563,402.93,236.6563,398.93,240.6563,407.93,236.6563" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="391.8201" y="231.394">*</text><!--MD5 [...]
-reverse link Oid to Object\nAdapter--><path codeLine="94" d="M629.02,110.5462 C630.89,133.9063 633.68,168.9163 635.84,195.9662 " fill="none" id="Oid-backto-Object\nAdapter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="628.62,105.4562,625.3526,114.7473,629.0199,110.4402,633.3269,114.1075,628.62,105.4562" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[43126a164b30e63a2d12c938be1a2b0f]
-link Oid to Object\nSpecId--><path codeLine="96" d="M594.78,84.1563 C520.69,84.1563 446.61,84.1563 372.53,84.1563 " fill="none" id="Oid-to-Object\nSpecId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="367.19,84.1563,376.19,88.1563,372.19,84.1563,376.19,80.1563,367.19,84.1563" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6f61920ce7b5feccf90b5a8b7a4d3ceb]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="694px" preserveAspectRatio="none" style="width:733px;height:694px;" version="1.1" viewBox="0 0 733 694" width="733px" zoomAndPan="magnify"><defs><filter height="300%" id="f1q9c7x0ueqiwj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorM [...]
+cluster metamodel--><polygon fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" points="16,6,99,6,106,28.7999,550,28.7999,550,687,16,687,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="106" y1="28.7999" y2="28.7999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="77" x="20" y="21.9999">metamodel</text><!--MD5=[58f92eeca1b9b283e19d96b306260adc]
+cluster runtime--><polygon fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" points="574,23.5,633,23.5,640,46.2999,716,46.2999,716,276,574,276,574,23.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="574" x2="640" y1="46.2999" y2="46.2999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="53" x="578" y="39.4999">runtime</text><!--MD5=[9bd84f0cda9d158e3d4f78628a93cd60]
+class Object\nSpecId--><rect codeLine="21" fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" height="74.4002" id="Object\nSpecId" style="stroke:#A80036;stroke-width:1.5;" width="69" x="302.5" y="41"/><ellipse cx="317.5" cy="67.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M316.8594,71.3814 Q317.6563,71.3814 318.2188,71.1939 Q318.7969,70.9908 319.0313,70.772 Q319.2813,70.5377 319.5156,70.3502 Q319.7656,70.147 319.9844,70.147 Q320.3281,70.147 320.5781,7 [...]
+class Object\nSpecification--><rect codeLine="25" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="95.6001" id="Object\nSpecification" style="stroke:#A80036;stroke-width:1.5;" width="141" x="104.5" y="175"/><ellipse cx="138.4" cy="201.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M137.7594,205.3814 Q138.5563,205.3814 139.1188,205.1939 Q139.6969,204.9908 139.9313,204.772 Q140.1813,204.5377 140.4156,204.3502 Q140.6656,204.147 140.8844,204.147 Q [...]
+class Object\nMember--><rect codeLine="31" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="Object\nMember" style="stroke:#A80036;stroke-width:1.5;" width="75" x="149.5" y="392"/><ellipse cx="164.5" cy="418.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M163.8594,422.3814 Q164.6563,422.3814 165.2188,422.1939 Q165.7969,421.9908 166.0313,421.772 Q166.2813,421.5377 166.5156,421.3502 Q166.7656,421.147 166.9844,421.147 Q167.3281,421.14 [...]
+class Object\nAction--><rect codeLine="35" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="Object\nAction" style="stroke:#A80036;stroke-width:1.5;" width="66" x="159" y="505"/><ellipse cx="174" cy="531.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M173.3594,535.3814 Q174.1563,535.3814 174.7188,535.1939 Q175.2969,534.9908 175.5313,534.772 Q175.7813,534.5377 176.0156,534.3502 Q176.2656,534.147 176.4844,534.147 Q176.8281,534.147 17 [...]
+class Object\nAssociation--><rect codeLine="39" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="Object\nAssociation" style="stroke:#A80036;stroke-width:1.5;" width="92" x="32" y="505"/><ellipse cx="47" cy="531.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M46.3594,535.3814 Q47.1563,535.3814 47.7188,535.1939 Q48.2969,534.9908 48.5313,534.772 Q48.7813,534.5377 49.0156,534.3502 Q49.2656,534.147 49.4844,534.147 Q49.8281,534.147 50.0 [...]
+class OneToOne\nAssociation--><rect codeLine="43" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="OneToOne\nAssociation" style="stroke:#A80036;stroke-width:1.5;" width="92" x="32" y="618"/><ellipse cx="47" cy="644.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M46.3594,648.3814 Q47.1563,648.3814 47.7188,648.1939 Q48.2969,647.9908 48.5313,647.772 Q48.7813,647.5377 49.0156,647.3502 Q49.2656,647.147 49.4844,647.147 Q49.8281,647.147  [...]
+class OneToMany\nAssociation--><rect codeLine="47" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="OneToMany\nAssociation" style="stroke:#A80036;stroke-width:1.5;" width="96" x="159" y="618"/><ellipse cx="174" cy="644.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M173.3594,648.3814 Q174.1563,648.3814 174.7188,648.1939 Q175.2969,647.9908 175.5313,647.772 Q175.7813,647.5377 176.0156,647.3502 Q176.2656,647.147 176.4844,647.147 Q176 [...]
+class FacetHolder--><rect codeLine="51" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="38.8002" id="FacetHolder" style="stroke:#A80036;stroke-width:1.5;" width="99" x="280.5" y="203.5"/><ellipse cx="295.5" cy="222.9001" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M298.1719,226.197 Q298.7188,226.197 299,226.3845 Q299.2813,226.5564 299.2813,227.0564 Q299.2813,227.9001 298.1719,227.9001 L293.0313,227.9001 Q291.9063,227.9001 291.9063,227.0564 Q291. [...]
+class Object\nActionParameter--><rect codeLine="54" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="Object\nActionParameter" style="stroke:#A80036;stroke-width:1.5;" width="119" x="265.5" y="392"/><ellipse cx="280.5" cy="418.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M279.8594,422.3814 Q280.6563,422.3814 281.2188,422.1939 Q281.7969,421.9908 282.0313,421.772 Q282.2813,421.5377 282.5156,421.3502 Q282.7656,421.147 282.9844,421.1 [...]
+class OneToOne\nActionParameter--><rect codeLine="57" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="OneToOne\nActionParameter" style="stroke:#A80036;stroke-width:1.5;" width="119" x="260.5" y="505"/><ellipse cx="275.5" cy="531.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M274.8594,535.3814 Q275.6563,535.3814 276.2188,535.1939 Q276.7969,534.9908 277.0313,534.772 Q277.2813,534.5377 277.5156,534.3502 Q277.7656,534.147 277.9844,5 [...]
+class Facet--><rect codeLine="60" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="38.8002" id="Facet" style="stroke:#A80036;stroke-width:1.5;" width="64" x="415" y="203.5"/><ellipse cx="430" cy="222.9001" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M432.6719,226.197 Q433.2188,226.197 433.5,226.3845 Q433.7813,226.5564 433.7813,227.0564 Q433.7813,227.9001 432.6719,227.9001 L427.5313,227.9001 Q426.4063,227.9001 426.4063,227.0564 Q426.4063,226.5564  [...]
+class OneToMany\nActionParameter--><rect codeLine="63" fill="#00FFFF" filter="url(#f1q9c7x0ueqiwj)" height="53.2003" id="OneToMany\nActionParameter" style="stroke:#A80036;stroke-width:1.5;" width="119" x="414.5" y="505"/><ellipse cx="429.5" cy="531.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M428.8594,535.3814 Q429.6563,535.3814 430.2188,535.1939 Q430.7969,534.9908 431.0313,534.772 Q431.2813,534.5377 431.5156,534.3502 Q431.7656,534.147 431.9844 [...]
+class Object\nAdapter--><rect codeLine="68" fill="#90EE90" filter="url(#f1q9c7x0ueqiwj)" height="74.4002" id="Object\nAdapter" style="stroke:#A80036;stroke-width:1.5;" width="110" x="590" y="186"/><ellipse cx="621.2" cy="212.6002" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M620.5594,216.3814 Q621.3563,216.3814 621.9188,216.1939 Q622.4969,215.9908 622.7313,215.772 Q622.9813,215.5377 623.2156,215.3502 Q623.4656,215.147 623.6844,215.147 Q624.0281,215.1 [...]
+class Oid--><rect codeLine="71" fill="#FFFFFF" filter="url(#f1q9c7x0ueqiwj)" height="38.8002" id="Oid" style="stroke:#A80036;stroke-width:1.5;" width="67" x="600.5" y="58.5"/><ellipse cx="615.5" cy="77.9001" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M614.8594,81.6814 Q615.6563,81.6814 616.2188,81.4939 Q616.7969,81.2907 617.0313,81.072 Q617.2813,80.8376 617.5156,80.6501 Q617.7656,80.447 617.9844,80.447 Q618.3281,80.447 618.5781,80.7126 Q618.8438,80. [...]
+reverse link Object\nSpecId to Object\nSpecification--><path codeLine="78" d="M298.41,113.07 C277.5,131.52 251.35,154.6 228.51,174.77 " fill="none" id="Object\nSpecId-backto-Object\nSpecification" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="302.25,109.68,292.8546,112.6341,298.5004,112.9876,298.1468,118.6334,302.25,109.68" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ed7878ac517ae046682c90f495e7c07d]
+link Object\nSpecification to Object\nMember--><path codeLine="79" d="M177.94,271.34 C180.17,307.3 183.17,355.71 185.09,386.77 " fill="none" id="Object\nSpecification-to-Object\nMember" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="185.42,391.98,188.8722,382.756,185.1197,386.989,180.8867,383.2365,185.42,391.98" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="5" x="179.374 [...]
+reverse link Object\nMember to Object\nAssociation--><path codeLine="80" d="M147.61,459.61 C132.78,474.72 116.33,491.47 103.14,504.89 " fill="none" id="Object\nMember-backto-Object\nAssociation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="142.71,454.61,161.72,445.24,152.7,464.42,142.71,454.61" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[241503ab21274031e0e27ca51ddcf3f4]
+reverse link Object\nMember to Object\nAction--><path codeLine="81" d="M189.07,465.34 C189.67,478.85 190.32,493.15 190.85,504.89 " fill="none" id="Object\nMember-backto-Object\nAction" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="182.07,465.54,188.16,445.24,196.05,464.91,182.07,465.54" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b1dd17f101192166ad8ece1c1058fee]
+reverse link Object\nAssociation to OneToOne\nAssociation--><path codeLine="82" d="M78,578.34 C78,591.85 78,606.15 78,617.89 " fill="none" id="Object\nAssociation-backto-OneToOne\nAssociation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="71,578.24,78,558.24,85,578.24,71,578.24" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c4d38020f98201eb2fe41c2e8b25f5c7]
+reverse link Object\nAssociation to OneToMany\nAssociation--><path codeLine="83" d="M123.25,571.44 C141.15,586.84 161.23,604.12 177.24,617.89 " fill="none" id="Object\nAssociation-backto-OneToMany\nAssociation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.51,576.6,107.92,558.24,127.65,565.98,118.51,576.6" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[fed48b2c8a9a486fb23584c154f1ec15]
+reverse link Object\nActionParameter to OneToOne\nActionParameter--><path codeLine="84" d="M322.93,465.34 C322.33,478.85 321.68,493.15 321.15,504.89 " fill="none" id="Object\nActionParameter-backto-OneToOne\nActionParameter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="315.95,464.91,323.84,445.24,329.93,465.54,315.95,464.91" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6af0f7e8de7c83f30bca28014b14a2cb]
+reverse link Object\nActionParameter to OneToMany\nActionParameter--><path codeLine="85" d="M375.7,457.27 C396.76,472.96 420.67,490.77 439.63,504.89 " fill="none" id="Object\nActionParameter-backto-OneToMany\nActionParameter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="371.41,462.81,359.56,445.24,379.78,451.58,371.41,462.81" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b2b29efb307806de1bba54f1e5dc2be6]
+reverse link Object\nActionParameter to Object\nAction--><path codeLine="86" d="M290.31,448.46 C269.35,465.95 242.87,488.04 222.68,504.89 " fill="none" id="Object\nActionParameter-backto-Object\nAction" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="294.15,445.24,284.6802,447.9461,290.3147,448.4479,289.8129,454.0825,294.15,445.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLe [...]
+link Object\nSpecification to FacetHolder--><path codeLine="88" d="M245.54,223 C250.41,223 255.28,223 260.15,223 " fill="none" id="Object\nSpecification-to-FacetHolder" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="260.18,216,280.18,223,260.18,230,260.18,216" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7ed1b40c9d8e1ede63264d1d3150c096]
+reverse link FacetHolder to Object\nMember--><path codeLine="89" d="M304.25,258.85 C276,297.07 231.33,357.52 206.06,391.71 " fill="none" id="FacetHolder-backto-Object\nMember" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="298.77,254.48,316.29,242.55,310.03,262.8,298.77,254.48" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6d10f057513b3b6ea03cfbefdadc4b76]
+reverse link FacetHolder to Object\nActionParameter--><path codeLine="90" d="M329,262.55 C328.01,300.88 326.52,358.6 325.67,391.71 " fill="none" id="FacetHolder-backto-Object\nActionParameter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="322.01,262.37,329.52,242.55,336,262.73,322.01,262.37" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[78d434f5ba83524917ac2512edcf96ee]
+link FacetHolder to Facet--><path codeLine="91" d="M379.82,223 C389.8,223 399.78,223 409.76,223 " fill="none" id="FacetHolder-to-Facet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="414.98,223,405.98,219,409.98,223,405.98,227,414.98,223" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="5" x="401.9973" y="219.3581">*</text><!--MD5=[c65fd9c027a949229ee33a1638947856]
+reverse link Oid to Object\nAdapter--><path codeLine="94" d="M635.84,102.91 C637.58,125.59 640.23,159.98 642.23,185.98 " fill="none" id="Oid-backto-Object\nAdapter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635.44,97.69,632.1197,106.9623,635.8115,102.6762,640.0976,106.368,635.44,97.69" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[43126a164b30e63a2d12c938be1a2b0f]
+link Oid to Object\nSpecId--><path codeLine="96" d="M600.42,78 C525.91,78 451.39,78 376.88,78 " fill="none" id="Oid-to-Object\nSpecId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="371.51,78,380.51,82,376.51,78,380.51,74,371.51,78" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[211fc1c2ee190e4ab2c2f54078798d7a]
 @startuml
 hide empty members
 
@@ -129,7 +129,7 @@ Object\nAdapter  -up-> Oid
 Oid -right-> Object\nSpecId
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/core/2.0.0-M5/metamodel/about.html b/content/core/2.0.0-M5/metamodel/about.html
index bb51292..535b858 100644
--- a/content/core/2.0.0-M5/metamodel/about.html
+++ b/content/core/2.0.0-M5/metamodel/about.html
@@ -423,7 +423,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/metamodel/class-diagram.html b/content/core/2.0.0-M5/metamodel/class-diagram.html
index 12952f2..1e45839 100644
--- a/content/core/2.0.0-M5/metamodel/class-diagram.html
+++ b/content/core/2.0.0-M5/metamodel/class-diagram.html
@@ -465,7 +465,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/regressiontests/about.html b/content/core/2.0.0-M5/regressiontests/about.html
index 5964a60..eb175bc 100644
--- a/content/core/2.0.0-M5/regressiontests/about.html
+++ b/content/core/2.0.0-M5/regressiontests/about.html
@@ -422,7 +422,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/runtime/about.html b/content/core/2.0.0-M5/runtime/about.html
index c5a8c1c..f2eb8f1 100644
--- a/content/core/2.0.0-M5/runtime/about.html
+++ b/content/core/2.0.0-M5/runtime/about.html
@@ -423,7 +423,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/runtimeservices/about.html b/content/core/2.0.0-M5/runtimeservices/about.html
index 4cce326..38f639a 100644
--- a/content/core/2.0.0-M5/runtimeservices/about.html
+++ b/content/core/2.0.0-M5/runtimeservices/about.html
@@ -423,7 +423,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/transaction/about.html b/content/core/2.0.0-M5/transaction/about.html
index 7bee7b5..a9017af 100644
--- a/content/core/2.0.0-M5/transaction/about.html
+++ b/content/core/2.0.0-M5/transaction/about.html
@@ -421,7 +421,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/webapp/about.html b/content/core/2.0.0-M5/webapp/about.html
index 9ac512e..76cb3ed 100644
--- a/content/core/2.0.0-M5/webapp/about.html
+++ b/content/core/2.0.0-M5/webapp/about.html
@@ -423,7 +423,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/core/2.0.0-M5/webapp/webmodules.html b/content/core/2.0.0-M5/webapp/webmodules.html
index 80a380f..74e087f 100644
--- a/content/core/2.0.0-M5/webapp/webmodules.html
+++ b/content/core/2.0.0-M5/webapp/webmodules.html
@@ -618,7 +618,7 @@ H2Console</code></p></td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/about.html b/content/docs/2.0.0-M5/about.html
index be1cb5b..6c26c1c 100644
--- a/content/docs/2.0.0-M5/about.html
+++ b/content/docs/2.0.0-M5/about.html
@@ -982,7 +982,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/archive/1-x.html b/content/docs/2.0.0-M5/archive/1-x.html
index 1545852..1419c7a 100644
--- a/content/docs/2.0.0-M5/archive/1-x.html
+++ b/content/docs/2.0.0-M5/archive/1-x.html
@@ -702,7 +702,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/demo/about.html b/content/docs/2.0.0-M5/demo/about.html
index 4f471bd..70c4eb7 100644
--- a/content/docs/2.0.0-M5/demo/about.html
+++ b/content/docs/2.0.0-M5/demo/about.html
@@ -793,7 +793,7 @@ These are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" targ
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/downloads/how-to.html b/content/docs/2.0.0-M5/downloads/how-to.html
index 328f0a0..ff21a53 100644
--- a/content/docs/2.0.0-M5/downloads/how-to.html
+++ b/content/docs/2.0.0-M5/downloads/how-to.html
@@ -770,7 +770,7 @@ See <a href="https://gitbox.apache.org/setup/">gitbox setup</a> for more details
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html b/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html
index ea53e03..e6280aa 100644
--- a/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html
+++ b/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html
@@ -878,7 +878,7 @@ Slides available <strong><a href="http://www.danhaywood.com/spa2016/#/">here</a>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/going-deeper/books.html b/content/docs/2.0.0-M5/going-deeper/books.html
index bfe9a8a..ffb9eaa 100644
--- a/content/docs/2.0.0-M5/going-deeper/books.html
+++ b/content/docs/2.0.0-M5/going-deeper/books.html
@@ -748,7 +748,7 @@ It is implemented by Apache Isis' <a href="../../../vro/2.0.0-M5/about.html" cla
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/landing-page/components.html b/content/docs/2.0.0-M5/landing-page/components.html
index 9068e05..fef3dc2 100644
--- a/content/docs/2.0.0-M5/landing-page/components.html
+++ b/content/docs/2.0.0-M5/landing-page/components.html
@@ -719,7 +719,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/landing-page/guides.html b/content/docs/2.0.0-M5/landing-page/guides.html
index 25a19ce..5150b93 100644
--- a/content/docs/2.0.0-M5/landing-page/guides.html
+++ b/content/docs/2.0.0-M5/landing-page/guides.html
@@ -699,7 +699,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/landing-page/internal.html b/content/docs/2.0.0-M5/landing-page/internal.html
index 3f89f17..c674515 100644
--- a/content/docs/2.0.0-M5/landing-page/internal.html
+++ b/content/docs/2.0.0-M5/landing-page/internal.html
@@ -685,7 +685,7 @@ They include guides for day-to-day operations, as well as notes on the design/im
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/landing-page/libraries.html b/content/docs/2.0.0-M5/landing-page/libraries.html
index fad6b2e..fa3d63d 100644
--- a/content/docs/2.0.0-M5/landing-page/libraries.html
+++ b/content/docs/2.0.0-M5/landing-page/libraries.html
@@ -693,7 +693,7 @@ In other words, tools to help integrating system together.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/landing-page/releases.html b/content/docs/2.0.0-M5/landing-page/releases.html
index 031ecb1..ec07c3c 100644
--- a/content/docs/2.0.0-M5/landing-page/releases.html
+++ b/content/docs/2.0.0-M5/landing-page/releases.html
@@ -712,7 +712,7 @@ These usually include migration notes that explain how to migrate to new feature
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/mavendeps/about.html b/content/docs/2.0.0-M5/mavendeps/about.html
index 4aa197a..ddf6ea0 100644
--- a/content/docs/2.0.0-M5/mavendeps/about.html
+++ b/content/docs/2.0.0-M5/mavendeps/about.html
@@ -1143,7 +1143,7 @@ Otherwise it will be ignored.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/more-thanks/more-thanks.html b/content/docs/2.0.0-M5/more-thanks/more-thanks.html
index b1e0c2b..1e4b3a2 100644
--- a/content/docs/2.0.0-M5/more-thanks/more-thanks.html
+++ b/content/docs/2.0.0-M5/more-thanks/more-thanks.html
@@ -716,7 +716,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/parent-pom/about.html b/content/docs/2.0.0-M5/parent-pom/about.html
index 446a6e0..1afde41 100644
--- a/content/docs/2.0.0-M5/parent-pom/about.html
+++ b/content/docs/2.0.0-M5/parent-pom/about.html
@@ -753,7 +753,7 @@ It builds upon a similar POM provided by the Spring Boot framework, which ensure
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/resources/about.html b/content/docs/2.0.0-M5/resources/about.html
index 9c0d05f..0a6defc 100644
--- a/content/docs/2.0.0-M5/resources/about.html
+++ b/content/docs/2.0.0-M5/resources/about.html
@@ -660,7 +660,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/resources/cheatsheet.html b/content/docs/2.0.0-M5/resources/cheatsheet.html
index 6cc2d41..e5ba16d 100644
--- a/content/docs/2.0.0-M5/resources/cheatsheet.html
+++ b/content/docs/2.0.0-M5/resources/cheatsheet.html
@@ -668,7 +668,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/resources/icons.html b/content/docs/2.0.0-M5/resources/icons.html
index 3de198c..39bae84 100644
--- a/content/docs/2.0.0-M5/resources/icons.html
+++ b/content/docs/2.0.0-M5/resources/icons.html
@@ -677,7 +677,7 @@ Here are some open source icon sets for both personal and commercial use (though
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/_images/diag-5936d1561be55d4f98b2c97cf62e09251ce1dabf.svg b/content/docs/2.0.0-M5/starters/_images/diag-5936d1561be55d4f98b2c97cf62e09251ce1dabf.svg
index 20a495c..1e5573a 100644
--- a/content/docs/2.0.0-M5/starters/_images/diag-5936d1561be55d4f98b2c97cf62e09251ce1dabf.svg
+++ b/content/docs/2.0.0-M5/starters/_images/diag-5936d1561be55d4f98b2c97cf62e09251ce1dabf.svg
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="344px" preserveAspectRatio="none" style="width:346px;height:344px;" version="1.1" viewBox="0 0 346 344" width="346px" zoomAndPan="magnify"><defs><filter height="300%" id="f14jt2wcebsp4i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorM [...]
-entity webapp--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="143" x="97" y="263"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="220" y="268"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="218" y="270"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="218" y="274"/><text fill="#000000" font-family="san [...]
-entity module-order--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="143" x="97" y="135"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="220" y="140"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="218" y="142"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="218" y="146"/><text fill="#000000" font-famil [...]
-entity module-customer--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="147" x="185" y="7"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="312" y="12"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="310" y="14"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="310" y="18"/><text fill="#000000" font-family [...]
-entity module-product--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="143" x="7" y="7"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="130" y="12"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="128" y="14"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="128" y="18"/><text fill="#000000" font-family="s [...]
-reverse link module-order to webapp--><path d="M168.5,208.38 C168.5,225.71 168.5,246 168.5,262.68 " fill="none" id="module-order-backto-webapp" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="168.5,203.11,164.5257,212.1214,168.5143,208.11,172.5257,212.0985,168.5,203.11" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a93c2e31ed9207dfd3e611bb28656920]
-reverse link module-customer to module-order--><path d="M231.72,79.49 C219.2,97.01 204.42,117.71 192.3,134.68 " fill="none" id="module-customer-backto-module-order" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="234.85,75.11,226.3706,80.1199,231.9492,79.1825,232.8866,84.7612,234.85,75.11" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[98362726b7f55382ac5b1ec0a90ea588]
-reverse link module-product to module-order--><path d="M105.28,79.49 C117.8,97.01 132.58,117.71 144.7,134.68 " fill="none" id="module-product-backto-module-order" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="102.15,75.11,104.1134,84.7612,105.0508,79.1825,110.6294,80.1199,102.15,75.11" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e81e7a5edd2048d68da91db2a3f560dc]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:345px;height:332px;" version="1.1" viewBox="0 0 345 332" width="345px" zoomAndPan="magnify"><defs><filter height="300%" id="f14jt2wcebsp4i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorM [...]
+entity webapp--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="144" x="97" y="255"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="221" y="260"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="219" y="262"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="219" y="266"/><text fill="#000000" font-family="san [...]
+entity module-order--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="144" x="97" y="131"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="221" y="136"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="219" y="138"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="219" y="142"/><text fill="#000000" font-famil [...]
+entity module-customer--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="145" x="186.5" y="7"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="311.5" y="12"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="309.5" y="14"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="309.5" y="18"/><text fill="#000000" fon [...]
+entity module-product--><rect fill="#FEFECE" filter="url(#f14jt2wcebsp4i)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="144" x="7" y="7"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="131" y="12"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="129" y="14"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="129" y="18"/><text fill="#000000" font-family="s [...]
+reverse link module-order to webapp--><path d="M169,200.38 C169,217.76 169,238.33 169,254.96 " fill="none" id="module-order-backto-webapp" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="169,195.1,165,204.1,169,200.1,173,204.1,169,195.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a93c2e31ed9207dfd3e611bb28656920]
+reverse link module-customer to module-order--><path d="M232.82,75.49 C219.87,93.04 204.38,114.04 191.9,130.96 " fill="none" id="module-customer-backto-module-order" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="236.06,71.1,227.5099,75.9882,233.1013,75.1307,233.9589,80.7221,236.06,71.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[98362726b7f55382ac5b1ec0a90ea588]
+reverse link module-product to module-order--><path d="M105.18,75.49 C118.13,93.04 133.62,114.04 146.1,130.96 " fill="none" id="module-product-backto-module-order" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="101.94,71.1,104.0411,80.7221,104.8987,75.1307,110.4901,75.9882,101.94,71.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[fa5f6d7871aae076eb222227fa4bbc45]
 @startuml
 [webapp] <<maven module>>
 [module-order]  <<maven module>>
@@ -17,7 +17,7 @@ reverse link module-product to module-order--><path d="M105.28,79.49 C117.8,97.0
 [module-order] .u-> [module-product]
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/docs/2.0.0-M5/starters/_images/diag-8ab7baff76ffc186da54f47082e4791d011a387e.svg b/content/docs/2.0.0-M5/starters/_images/diag-8ab7baff76ffc186da54f47082e4791d011a387e.svg
index b8bb4b9..825ad7e 100644
--- a/content/docs/2.0.0-M5/starters/_images/diag-8ab7baff76ffc186da54f47082e4791d011a387e.svg
+++ b/content/docs/2.0.0-M5/starters/_images/diag-8ab7baff76ffc186da54f47082e4791d011a387e.svg
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="216px" preserveAspectRatio="none" style="width:382px;height:216px;" version="1.1" viewBox="0 0 382 216" width="382px" zoomAndPan="magnify"><defs><filter height="300%" id="f12rtmkz7kgck" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMa [...]
-entity webapp-...-tests--><rect fill="#ADD8E6" filter="url(#f12rtmkz7kgck)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="143" x="186.5" y="135"/><rect fill="#ADD8E6" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="309.5" y="140"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="307.5" y="142"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="307.5" y="146"/><text fill="#000000 [...]
-entity webapp-...--><rect fill="#FEFECE" filter="url(#f12rtmkz7kgck)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="143" x="8.5" y="135"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="131.5" y="140"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="129.5" y="142"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="129.5" y="146"/><text fill="#000000" font-f [...]
-entity module-...-simple-tests--><rect fill="#ADD8E6" filter="url(#f12rtmkz7kgck)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="180" x="188" y="7"/><rect fill="#ADD8E6" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="348" y="12"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="346" y="14"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="346" y="18"/><text fill="#000000" font [...]
-entity module-...-simple--><rect fill="#FEFECE" filter="url(#f12rtmkz7kgck)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="146" x="7" y="7"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="133" y="12"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="131" y="14"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="131" y="18"/><text fill="#000000" font-family= [...]
-reverse link webapp-... to webapp-...-tests--><path d="M156.74,169 C166.53,169 176.32,169 186.11,169 " fill="none" id="webapp-...-backto-webapp-...-tests" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="151.62,169,160.62,173,156.62,169,160.62,165,151.62,169" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2d9120dc6065fa8fb4d6903ca1c8f0d7]
-reverse link module-...-simple to module-...-simple-tests--><path d="M158.23,41 C168.07,41 177.9,41 187.73,41 " fill="none" id="module-...-simple-backto-module-...-simple-tests" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="153.09,41,162.09,45,158.09,41,162.09,37,153.09,41" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[99803cd72466681fd9c106dbb9440abd]
-reverse link module-...-simple to webapp-...--><path d="M80,80.38 C80,97.71 80,118 80,134.68 " fill="none" id="module-...-simple-backto-webapp-..." style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="80,75.11,76.0257,84.1214,80.0143,80.11,84.0257,84.0985,80,75.11" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a5a95fe65185b7f97439e0c66782bb0f]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="208px" preserveAspectRatio="none" style="width:380px;height:208px;" version="1.1" viewBox="0 0 380 208" width="380px" zoomAndPan="magnify"><defs><filter height="300%" id="f12rtmkz7kgck" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMa [...]
+entity webapp-...-tests--><rect fill="#ADD8E6" filter="url(#f12rtmkz7kgck)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="144" x="186.5" y="131"/><rect fill="#ADD8E6" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="310.5" y="136"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="308.5" y="138"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="308.5" y="142"/><text fill="#000000 [...]
+entity webapp-...--><rect fill="#FEFECE" filter="url(#f12rtmkz7kgck)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="144" x="7.5" y="131"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="131.5" y="136"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="129.5" y="138"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="129.5" y="142"/><text fill="#000000" font-f [...]
+entity module-...-simple-tests--><rect fill="#ADD8E6" filter="url(#f12rtmkz7kgck)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="179" x="187" y="7"/><rect fill="#ADD8E6" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="346" y="12"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="344" y="14"/><rect fill="#ADD8E6" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="344" y="18"/><text fill="#000000" font [...]
+entity module-...-simple--><rect fill="#FEFECE" filter="url(#f12rtmkz7kgck)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="145" x="7" y="7"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="132" y="12"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="130" y="14"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="130" y="18"/><text fill="#000000" font-family= [...]
+reverse link webapp-... to webapp-...-tests--><path d="M156.67,163 C166.51,163 176.36,163 186.2,163 " fill="none" id="webapp-...-backto-webapp-...-tests" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="151.52,163,160.52,167,156.52,163,160.52,159,151.52,163" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2d9120dc6065fa8fb4d6903ca1c8f0d7]
+reverse link module-...-simple to module-...-simple-tests--><path d="M157.34,39 C167.12,39 176.9,39 186.69,39 " fill="none" id="module-...-simple-backto-module-...-simple-tests" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="152.22,39,161.22,43,157.22,39,161.22,35,152.22,39" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[99803cd72466681fd9c106dbb9440abd]
+reverse link module-...-simple to webapp-...--><path d="M79.5,76.38 C79.5,93.76 79.5,114.33 79.5,130.96 " fill="none" id="module-...-simple-backto-webapp-..." style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="79.5,71.1,75.5,80.1,79.5,76.1,83.5,80.1,79.5,71.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a136acb60e42643ba10df8efd4715463]
 @startuml
 [webapp-...-tests] <<maven module>> #LightBlue
 [webapp-...] <<maven module>>
@@ -17,7 +17,7 @@ reverse link module-...-simple to webapp-...--><path d="M80,80.38 C80,97.71 80,1
 [webapp-...] .u-> [module-...-simple]
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/docs/2.0.0-M5/starters/about.html b/content/docs/2.0.0-M5/starters/about.html
index 8977e3c..df265da 100644
--- a/content/docs/2.0.0-M5/starters/about.html
+++ b/content/docs/2.0.0-M5/starters/about.html
@@ -775,7 +775,7 @@ A much more complete explanation of the structure of the app (and how to use it)
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html b/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html
index d030a5b..36bcc60 100644
--- a/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html
+++ b/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html
@@ -651,7 +651,7 @@ mvn spring-boot:run</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html b/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html
index 4d3a4f8..9828228 100644
--- a/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html
+++ b/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html
@@ -651,7 +651,7 @@ mvn spring-boot:run</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/helloworld.html b/content/docs/2.0.0-M5/starters/helloworld.html
index 5a746c9..ec31f8a 100644
--- a/content/docs/2.0.0-M5/starters/helloworld.html
+++ b/content/docs/2.0.0-M5/starters/helloworld.html
@@ -1498,7 +1498,7 @@ Although a little more complex, it provides more structure and example tests, al
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html b/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html
index 783549a..b475009 100644
--- a/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html
+++ b/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html
@@ -651,7 +651,7 @@ mvn -pl webapp spring-boot:run</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html b/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html
index e65056c..6dc1dfe 100644
--- a/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html
+++ b/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html
@@ -651,7 +651,7 @@ mvn -pl webapp spring-boot:run</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/starters/simpleapp.html b/content/docs/2.0.0-M5/starters/simpleapp.html
index 3390c89..63ed043 100644
--- a/content/docs/2.0.0-M5/starters/simpleapp.html
+++ b/content/docs/2.0.0-M5/starters/simpleapp.html
@@ -2394,7 +2394,7 @@ docker rm sqlserver</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/support/about.html b/content/docs/2.0.0-M5/support/about.html
index 81ebed9..9853161 100644
--- a/content/docs/2.0.0-M5/support/about.html
+++ b/content/docs/2.0.0-M5/support/about.html
@@ -698,7 +698,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/support/mailing-list.html b/content/docs/2.0.0-M5/support/mailing-list.html
index bf3705a..f7da5d4 100644
--- a/content/docs/2.0.0-M5/support/mailing-list.html
+++ b/content/docs/2.0.0-M5/support/mailing-list.html
@@ -741,7 +741,7 @@ Try not to <a href="http://en.wikipedia.org/wiki/Posting_style#Top-posting)">top
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/support/slack-channel.html b/content/docs/2.0.0-M5/support/slack-channel.html
index fb39c8f..01d5b0d 100644
--- a/content/docs/2.0.0-M5/support/slack-channel.html
+++ b/content/docs/2.0.0-M5/support/slack-channel.html
@@ -743,7 +743,7 @@ Anyone can join:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html b/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html
index 0edf7d0..00045f6 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html
@@ -771,7 +771,7 @@ Apache Isis continues to manage the object lifecycle and persistence as a thin l
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html b/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html
index 5695e1d..00189fe 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html
@@ -1042,7 +1042,7 @@ Indeed, the example todoapp demonstrates this.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html
index ae012bf..fa8b09e 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html
@@ -930,7 +930,7 @@ More recent screencasts can be found <a href="./screencasts.html">here</a>.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html
index 694ef82..fa1cb5d 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html
@@ -2855,7 +2855,7 @@ Improving the layout of domain entities by adding a metadata fieldset.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html
index abeb71c..b42971a 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html
@@ -660,7 +660,7 @@ trib</a></p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/extensions/2.0.0-M5/about.html b/content/extensions/2.0.0-M5/about.html
index 66e9a06..fe4d5aa 100644
--- a/content/extensions/2.0.0-M5/about.html
+++ b/content/extensions/2.0.0-M5/about.html
@@ -400,26 +400,11 @@ for core extensions:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="../../security/2.0.0-M5/secman/about.html" class="page">Secman</a></p>
+<p><a href="../../security/2.0.0-M5/secman/about.html" class="page">SecMan</a></p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="../../security/2.0.0-M5/secman/api.html" class="page">API</a></p>
-</li>
-<li>
-<p><a href="../../security/2.0.0-M5/secman/model.html" class="page">Model</a></p>
-</li>
-<li>
-<p><a href="../../security/2.0.0-M5/secman/jbcrypt-encryption.html" class="page">JBCrypt Encryption</a></p>
-</li>
-<li>
-<p><a href="../../security/2.0.0-M5/secman/jdo-persistence.html" class="page">JDO Persistence</a></p>
-</li>
-<li>
-<p><a href="../../security/2.0.0-M5/secman/jpa-persistence.html" class="page">JPA Persistence</a></p>
-</li>
-<li>
-<p><a href="../../security/2.0.0-M5/secman/shiro-realm.html" class="page">Realm (for Shiro)</a></p>
+<p><a href="../../security/2.0.0-M5/secman/setting-up.html" class="page">Setting up</a></p>
 </li>
 </ul>
 </div>
@@ -486,7 +471,7 @@ for core extensions:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/about.html b/content/incubator/2.0.0-M5/about.html
index 0d67518..add67c7 100644
--- a/content/incubator/2.0.0-M5/about.html
+++ b/content/incubator/2.0.0-M5/about.html
@@ -394,7 +394,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html b/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html
index 1df8b9b..aa8068a 100644
--- a/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html
+++ b/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html
@@ -1041,7 +1041,7 @@ mvn -Djetty.port=8080 jetty:run -DPROTOTYPING</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/kroviz/UsersGuide.html b/content/incubator/2.0.0-M5/kroviz/UsersGuide.html
index f057a62..dadd8a1 100644
--- a/content/incubator/2.0.0-M5/kroviz/UsersGuide.html
+++ b/content/incubator/2.0.0-M5/kroviz/UsersGuide.html
@@ -522,7 +522,7 @@ Such renderes should as well have links leading back to 'plain old object' rende
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-21002c3b24ff3586c7f6c1c97b8a50e9527e7d0c.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-21002c3b24ff3586c7f6c1c97b8a50e9527e7d0c.svg
index b545cd4..2b8cbc2 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-21002c3b24ff3586c7f6c1c97b8a50e9527e7d0c.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-21002c3b24ff3586c7f6c1c97b8a50e9527e7d0c.svg
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1172px" preserveAspectRatio="none" style="width:577px;height:1172px;" version="1.1" viewBox="0 0 577 1172" width="577px" zoomAndPan="magnify"><defs><filter height="300%" id="f18wq6hhqr9kqb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feCol [...]
-cluster core--><polygon fill="#FFFFFF" filter="url(#f18wq6hhqr9kqb)" points="428,147,461,147,468,171.8945,560,171.8945,560,263,428,263,428,147" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="428" x2="468" y1="171.8945" y2="171.8945"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="27" x="432" y="163.7383">core</text><!--MD5=[602dbec1f7d4de6c4f5ea6846e774687]
-class core.Dispatcher--><rect codeLine="21" fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="62.8457" id="core.Dispatcher" style="stroke:#A80036;stroke-width:1.5;" width="99" x="444.5" y="184"/><ellipse cx="464.9" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M460.8375,200.1406 Q460.8375,196.6875 461.9313,195.0625 Q463.0406,193.4219 465.2594,193.4219 Q466.4625,193.4219 467.7281,194.0781 L467.7281,196.125 Q466.275,195.3438 465.3375,195.3438 [...]
-class IHandler--><rect codeLine="1" fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="92.5371" id="IHandler" style="stroke:#A80036;stroke-width:1.5;" width="74" x="208" y="7"/><ellipse cx="223" cy="23" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M225.6563,29.2031 L219.5313,29.2031 L219.5313,27.3125 L221.5313,27.3125 L221.5313,17.9844 L219.5313,17.9844 L219.5313,16.0938 L225.6563,16.0938 L225.6563,17.9844 L223.6563,17.9844 L223.6563,27.3125 L225.65 [...]
-class AbstractHandler--><rect codeLine="6" fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="107.3828" id="AbstractHandler" style="stroke:#A80036;stroke-width:1.5;" width="114" x="188" y="162"/><ellipse cx="203" cy="178" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M203.0469,172.1719 L203.0781,172.1719 L202.0625,178.25 L204.0625,178.25 L203.0469,172.1719 Z M204.4688,180.125 L201.6563,180.125 L200.8594,183.7031 L198.7344,183.7031 L201.9844,170.5938  [...]
-class ListHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ListHandler" style="stroke:#A80036;stroke-width:1.5;" width="90" x="227" y="729"/><ellipse cx="242" cy="745" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M237.9375,745.1406 Q237.9375,741.6875 239.0313,740.0625 Q240.1406,738.4219 242.3594,738.4219 Q243.5625,738.4219 244.8281,739.0781 L244.8281,741.125 Q243.375,740.3438 242.4375,740.3438 Q239.9844,740.3438 239.9844,74 [...]
-class MemberHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="MemberHandler" style="stroke:#A80036;stroke-width:1.5;" width="113" x="298.5" y="602"/><ellipse cx="313.5" cy="618" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M309.4375,618.1406 Q309.4375,614.6875 310.5313,613.0625 Q311.6406,611.4219 313.8594,611.4219 Q315.0625,611.4219 316.3281,612.0781 L316.3281,614.125 Q314.875,613.3438 313.9375,613.3438 Q311.4844,613.3438 31 [...]
-class ServiceHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ServiceHandler" style="stroke:#A80036;stroke-width:1.5;" width="108" x="440" y="348"/><ellipse cx="455" cy="364" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M450.9375,364.1406 Q450.9375,360.6875 452.0313,359.0625 Q453.1406,357.4219 455.3594,357.4219 Q456.5625,357.4219 457.8281,358.0781 L457.8281,360.125 Q456.375,359.3438 455.4375,359.3438 Q452.9844,359.3438 452. [...]
-class DefaultHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="DefaultHandler" style="stroke:#A80036;stroke-width:1.5;" width="108" x="7" y="1110"/><ellipse cx="22" cy="1126" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M17.9375,1126.1406 Q17.9375,1122.6875 19.0313,1121.0625 Q20.1406,1119.4219 22.3594,1119.4219 Q23.5625,1119.4219 24.8281,1120.0781 L24.8281,1122.125 Q23.375,1121.3438 22.4375,1121.3438 Q19.9844,1121.3438 19.98 [...]
-class LayoutHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="LayoutHandler" style="stroke:#A80036;stroke-width:1.5;" width="104" x="85" y="983"/><ellipse cx="100" cy="999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M95.9375,999.1406 Q95.9375,995.6875 97.0313,994.0625 Q98.1406,992.4219 100.3594,992.4219 Q101.5625,992.4219 102.8281,993.0781 L102.8281,995.125 Q101.375,994.3438 100.4375,994.3438 Q97.9844,994.3438 97.9844,999. [...]
-class ObjectListHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ObjectListHandler" style="stroke:#A80036;stroke-width:1.5;" width="123" x="156.5" y="856"/><ellipse cx="171.5" cy="872" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M167.4375,872.1406 Q167.4375,868.6875 168.5313,867.0625 Q169.6406,865.4219 171.8594,865.4219 Q173.0625,865.4219 174.3281,866.0781 L174.3281,868.125 Q172.875,867.3438 171.9375,867.3438 Q169.4844,867 [...]
-class ActionHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ActionHandler" style="stroke:#A80036;stroke-width:1.5;" width="103" x="369.5" y="475"/><ellipse cx="384.5" cy="491" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M380.4375,491.1406 Q380.4375,487.6875 381.5313,486.0625 Q382.6406,484.4219 384.8594,484.4219 Q386.0625,484.4219 387.3281,485.0781 L387.3281,487.125 Q385.875,486.3438 384.9375,486.3438 Q382.4844,486.3438 38 [...]
-reverse link IHandler to AbstractHandler--><path codeLine="12" d="M245,120.58 C245,134.34 245,148.68 245,161.87 " fill="none" id="IHandler-backto-AbstractHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="238,120.35,245,100.35,252,120.35,238,120.35" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1e1a9f76e335bb6e4b141b5634f6564f]
-reverse link AbstractHandler to ListHandler--><path codeLine="13" d="M245,289.34 C245,315.13 245,344.36 245,371 C245,371 245,371 245,627 C245,663.19 255.95,703.97 263.9,728.82 " fill="none" id="AbstractHandler-backto-ListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="238,289.06,245,269.06,252,289.06,238,289.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e378d0f5a1852855970ccf5bbfb738ff]
-reverse link AbstractHandler to MemberHandler--><path codeLine="14" d="M267.9,288.39 C268.97,291.97 270.01,295.52 271,299 C303.32,411.94 336.67,548.5 349.51,601.96 " fill="none" id="AbstractHandler-backto-MemberHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="261.19,290.36,262.06,269.19,274.58,286.28,261.19,290.36" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[de4a9ef009c7b38c76d1f8afa542e34c]
-reverse link AbstractHandler to ServiceHandler--><path codeLine="15" d="M320.6,249.5 C349.45,263.31 382.09,280.47 410,299 C431.76,313.45 454.11,332.87 470.28,347.9 " fill="none" id="AbstractHandler-backto-ServiceHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="317.42,255.74,302.27,240.92,323.35,243.06,317.42,255.74" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[4b442c1ce230fecf3cde00f32c933cfd]
-reverse link AbstractHandler to DefaultHandler--><path codeLine="16" d="M168.7,237.68 C107.58,259.84 32,301.34 32,371 C32,371 32,371 32,1008 C32,1044.31 43.76,1085.06 52.3,1109.87 " fill="none" id="AbstractHandler-backto-DefaultHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="166.73,230.96,187.92,231.15,171.23,244.21,166.73,230.96" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b032d7f4ca466463727e12c79a370096]
-reverse link AbstractHandler to LayoutHandler--><path codeLine="17" d="M171.29,260.86 C136.72,287.71 103,325.55 103,371 C103,371 103,371 103,881 C103,917.43 116.62,957.81 126.61,982.55 " fill="none" id="AbstractHandler-backto-LayoutHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="167.37,255.06,187.65,248.94,175.61,266.37,167.37,255.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2afa2609233b453cd4c2684e22e2fc94]
-reverse link AbstractHandler to ObjectListHandler--><path codeLine="18" d="M197.47,286.91 C184.53,312.3 174,341.9 174,371 C174,371 174,371 174,754 C174,791.27 191.62,831.43 204.56,855.89 " fill="none" id="AbstractHandler-backto-ObjectListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="191.43,283.37,207.21,269.22,203.7,290.12,191.43,283.37" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5905d95551bd1ca66aa16905076252fa]
-reverse link AbstractHandler to ActionHandler--><path codeLine="19" d="M317.17,270.73 C326.26,279.52 334.86,289.04 342,299 C382.5,355.49 405.98,435.64 415.7,474.74 " fill="none" id="AbstractHandler-backto-ActionHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="312.24,275.71,302.11,257.1,321.64,265.33,312.24,275.71" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a4a5b3a7d6c003c3d1a274d923e00a94]
-link core.Dispatcher to ServiceHandler--><path codeLine="24" d="M494,247.02 C494,274.73 494,315.27 494,342.37 " fill="none" id="core.Dispatcher-to-ServiceHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="494,347.6,498,338.6,494,342.6,490,338.6,494,347.6" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="49" x="495" y="313.6855">delegate</text><!--MD5=[f6679089ebdf89bdb [...]
-link ServiceHandler to ActionHandler--><path codeLine="25" d="M480.44,396.22 C468.15,417.27 450.02,448.31 437.02,470.58 " fill="none" id="ServiceHandler-to-ActionHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="434.49,474.91,442.4776,469.1482,437.0076,470.5901,435.5657,465.1201,434.49,474.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="462" y="440.6855">s [...]
-link ActionHandler to MemberHandler--><path codeLine="26" d="M408.74,523.22 C397.67,544.18 381.37,575.05 369.63,597.3 " fill="none" id="ActionHandler-to-MemberHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="367.19,601.91,374.919,595.8056,369.517,597.4845,367.8381,592.0825,367.19,601.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="393" y="567.6855">succes [...]
-link MemberHandler to ListHandler--><path codeLine="27" d="M339.58,650.22 C325.61,671.27 304.99,702.31 290.21,724.58 " fill="none" id="MemberHandler-to-ListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="287.33,728.91,295.6422,723.6272,290.0969,724.7454,288.9787,719.2001,287.33,728.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="320" y="694.6855">success [...]
-link ListHandler to ObjectListHandler--><path codeLine="28" d="M261.97,777.22 C252.91,798.18 239.58,829.05 229.97,851.3 " fill="none" id="ListHandler-to-ObjectListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="227.98,855.91,235.2194,849.2323,229.9616,851.3195,227.8745,846.0617,227.98,855.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="250" y="821.6855"> [...]
-link ObjectListHandler to LayoutHandler--><path codeLine="29" d="M202.95,904.22 C189.31,925.27 169.2,956.31 154.77,978.58 " fill="none" id="ObjectListHandler-to-LayoutHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="151.97,982.91,160.2229,977.535,154.6904,978.7148,153.5106,973.1824,151.97,982.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="184" y="948.685 [...]
-link LayoutHandler to DefaultHandler--><path codeLine="30" d="M122.88,1031.22 C110.09,1052.27 91.21,1083.31 77.67,1105.58 " fill="none" id="LayoutHandler-to-DefaultHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="75.04,1109.91,83.1363,1104.302,77.6397,1105.639,76.3027,1100.1424,75.04,1109.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="105" y="1075.6855"> [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1147px" preserveAspectRatio="none" style="width:579px;height:1147px;" version="1.1" viewBox="0 0 579 1147" width="579px" zoomAndPan="magnify"><defs><filter height="300%" id="f18wq6hhqr9kqb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feCol [...]
+cluster core--><polygon fill="#FFFFFF" filter="url(#f18wq6hhqr9kqb)" points="434,142,470,142,477,164.7999,562,164.7999,562,254,434,254,434,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="434" x2="477" y1="164.7999" y2="164.7999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="438" y="157.9999">core</text><!--MD5=[602dbec1f7d4de6c4f5ea6846e774687]
+class core.Dispatcher--><rect codeLine="21" fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="61.1999" id="core.Dispatcher" style="stroke:#A80036;stroke-width:1.5;" width="97" x="449.5" y="177"/><ellipse cx="468.55" cy="193" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M467.9094,196.7813 Q468.7063,196.7813 469.2688,196.5938 Q469.8469,196.3906 470.0813,196.1719 Q470.3313,195.9375 470.5656,195.75 Q470.8156,195.5469 471.0344,195.5469 Q471.3781,195.546 [...]
+class IHandler--><rect codeLine="1" fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="87.5997" id="IHandler" style="stroke:#A80036;stroke-width:1.5;" width="78" x="207" y="7"/><ellipse cx="222" cy="23" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M224.6719,26.2969 Q225.2188,26.2969 225.5,26.4844 Q225.7813,26.6563 225.7813,27.1563 Q225.7813,28 224.6719,28 L219.5313,28 Q218.4063,28 218.4063,27.1563 Q218.4063,26.6563 218.6875,26.4844 Q218.9844,26.2969 [...]
+class AbstractHandler--><rect codeLine="6" fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="100.7996" id="AbstractHandler" style="stroke:#A80036;stroke-width:1.5;" width="119" x="186.5" y="157"/><ellipse cx="201.5" cy="173" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M202.4531,176.6563 Q202.4531,176.1563 202.7344,175.9844 Q203.0313,175.7969 203.5781,175.7969 L203.9688,175.7969 L203.5781,174.8125 L199.5313,174.8125 L199.1406,175.7969 L199.5313,175 [...]
+class ListHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ListHandler" style="stroke:#A80036;stroke-width:1.5;" width="93" x="228.5" y="710"/><ellipse cx="243.5" cy="726" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M242.8594,729.7813 Q243.6563,729.7813 244.2188,729.5938 Q244.7969,729.3906 245.0313,729.1719 Q245.2813,728.9375 245.5156,728.75 Q245.7656,728.5469 245.9844,728.5469 Q246.3281,728.5469 246.5781,728.8125 Q246.843 [...]
+class MemberHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="MemberHandler" style="stroke:#A80036;stroke-width:1.5;" width="117" x="299.5" y="585"/><ellipse cx="314.5" cy="601" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M313.8594,604.7813 Q314.6563,604.7813 315.2188,604.5938 Q315.7969,604.3906 316.0313,604.1719 Q316.2813,603.9375 316.5156,603.75 Q316.7656,603.5469 316.9844,603.5469 Q317.3281,603.5469 317.5781,603.8125 Q31 [...]
+class ServiceHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ServiceHandler" style="stroke:#A80036;stroke-width:1.5;" width="113" x="441.5" y="335"/><ellipse cx="456.5" cy="351" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M455.8594,354.7813 Q456.6563,354.7813 457.2188,354.5938 Q457.7969,354.3906 458.0313,354.1719 Q458.2813,353.9375 458.5156,353.75 Q458.7656,353.5469 458.9844,353.5469 Q459.3281,353.5469 459.5781,353.8125 Q [...]
+class DefaultHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="DefaultHandler" style="stroke:#A80036;stroke-width:1.5;" width="110" x="7" y="1085"/><ellipse cx="22" cy="1101" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M21.3594,1104.7813 Q22.1563,1104.7813 22.7188,1104.5938 Q23.2969,1104.3906 23.5313,1104.1719 Q23.7813,1103.9375 24.0156,1103.75 Q24.2656,1103.5469 24.4844,1103.5469 Q24.8281,1103.5469 25.0781,1103.8125 Q25.34 [...]
+class LayoutHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="LayoutHandler" style="stroke:#A80036;stroke-width:1.5;" width="109" x="86.5" y="960"/><ellipse cx="101.5" cy="976" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M100.8594,979.7813 Q101.6563,979.7813 102.2188,979.5938 Q102.7969,979.3906 103.0313,979.1719 Q103.2813,978.9375 103.5156,978.75 Q103.7656,978.5469 103.9844,978.5469 Q104.3281,978.5469 104.5781,978.8125 Q104 [...]
+class ObjectListHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ObjectListHandler" style="stroke:#A80036;stroke-width:1.5;" width="127" x="157.5" y="835"/><ellipse cx="172.5" cy="851" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M171.8594,854.7813 Q172.6563,854.7813 173.2188,854.5938 Q173.7969,854.3906 174.0313,854.1719 Q174.2813,853.9375 174.5156,853.75 Q174.7656,853.5469 174.9844,853.5469 Q175.3281,853.5469 175.5781,853. [...]
+class ActionHandler--><rect fill="#FEFECE" filter="url(#f18wq6hhqr9kqb)" height="48" id="ActionHandler" style="stroke:#A80036;stroke-width:1.5;" width="106" x="370" y="460"/><ellipse cx="385" cy="476" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M384.3594,479.7813 Q385.1563,479.7813 385.7188,479.5938 Q386.2969,479.3906 386.5313,479.1719 Q386.7813,478.9375 387.0156,478.75 Q387.2656,478.5469 387.4844,478.5469 Q387.8281,478.5469 388.0781,478.8125 Q388.34 [...]
+reverse link IHandler to AbstractHandler--><path codeLine="12" d="M246,115.34 C246,129.19 246,143.65 246,156.87 " fill="none" id="IHandler-backto-AbstractHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="239,115.04,246,95.04,253,115.04,239,115.04" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1e1a9f76e335bb6e4b141b5634f6564f]
+reverse link AbstractHandler to ListHandler--><path codeLine="13" d="M246,278.47 C246,303.56 246,332.05 246,358 C246,358 246,358 246,610 C246,645.54 257.61,685.36 266.14,709.8 " fill="none" id="AbstractHandler-backto-ListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="239,278.33,246,258.33,253,278.33,239,278.33" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e378d0f5a1852855970ccf5bbfb738ff]
+reverse link AbstractHandler to MemberHandler--><path codeLine="14" d="M268.94,277.93 C269.99,281.33 271.02,284.7 272,288 C304.91,398.55 339.02,532.22 352.27,584.99 " fill="none" id="AbstractHandler-backto-MemberHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="262.13,279.59,262.78,258.41,275.48,275.37,262.13,279.59" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[de4a9ef009c7b38c76d1f8afa542e34c]
+reverse link AbstractHandler to ServiceHandler--><path codeLine="15" d="M324.14,240.9 C352.9,254.06 385.22,270.33 413,288 C434.61,301.75 456.89,320.29 473.21,334.83 " fill="none" id="AbstractHandler-backto-ServiceHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="321.24,247.27,305.83,232.72,326.95,234.49,321.24,247.27" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[4b442c1ce230fecf3cde00f32c933cfd]
+reverse link AbstractHandler to DefaultHandler--><path codeLine="16" d="M167.25,229.11 C106.58,250.31 33,290.02 33,358 C33,358 33,358 33,985 C33,1020.54 44.61,1060.36 53.14,1084.8 " fill="none" id="AbstractHandler-backto-DefaultHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="165.2,222.42,186.38,222.87,169.54,235.73,165.2,222.42" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b032d7f4ca466463727e12c79a370096]
+reverse link AbstractHandler to LayoutHandler--><path codeLine="17" d="M169.68,252.86 C136.04,278.56 104,314.47 104,358 C104,358 104,358 104,860 C104,895.9 118.63,935.3 129.5,959.59 " fill="none" id="AbstractHandler-backto-LayoutHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="165.85,246.99,186.19,241.07,173.98,258.39,165.85,246.99" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2afa2609233b453cd4c2684e22e2fc94]
+reverse link AbstractHandler to ObjectListHandler--><path codeLine="18" d="M198.76,275.9 C185.68,300.58 175,329.47 175,358 C175,358 175,358 175,735 C175,771.71 193.19,810.89 206.7,834.92 " fill="none" id="AbstractHandler-backto-ObjectListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="192.81,272.2,208.84,258.33,204.96,279.17,192.81,272.2" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5905d95551bd1ca66aa16905076252fa]
+reverse link AbstractHandler to ActionHandler--><path codeLine="19" d="M320.62,262.94 C328.79,270.78 336.49,279.19 343,288 C383.58,342.87 407.49,421.29 417.48,459.82 " fill="none" id="AbstractHandler-backto-ActionHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="315.82,268.03,305.56,249.49,325.14,257.59,315.82,268.03" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a4a5b3a7d6c003c3d1a274d923e00a94]
+link core.Dispatcher to ServiceHandler--><path codeLine="24" d="M498,238.04 C498,264.68 498,303.6 498,329.82 " fill="none" id="core.Dispatcher-to-ServiceHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="498,334.89,502,325.89,498,329.89,494,325.89,498,334.89" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="49" x="499" y="302">delegate</text><!--MD5=[f6679089ebdf89bdbc [...]
+link ServiceHandler to ActionHandler--><path codeLine="25" d="M483.89,383.14 C471.37,403.67 453.07,433.69 439.8,455.46 " fill="none" id="ServiceHandler-to-ActionHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="437.04,459.97,445.1363,454.362,439.6397,455.699,438.3027,450.2024,437.04,459.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="465" y="427">successor [...]
+link ActionHandler to MemberHandler--><path codeLine="26" d="M410.77,508.14 C399.92,528.67 384.06,558.69 372.56,580.46 " fill="none" id="ActionHandler-to-MemberHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="370.17,584.97,377.9225,578.8955,372.514,580.5535,370.8561,575.1451,370.17,584.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="396" y="552">successor [...]
+link MemberHandler to ListHandler--><path codeLine="27" d="M342.39,633.14 C328.48,653.75 308.1,683.94 293.4,705.73 " fill="none" id="MemberHandler-to-ListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="290.54,709.97,298.8937,704.7532,293.3398,705.8274,292.2656,700.2735,290.54,709.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="323" y="677">successor</tex [...]
+link ListHandler to ObjectListHandler--><path codeLine="28" d="M264.84,758.14 C255.87,778.58 242.76,808.44 233.21,830.18 " fill="none" id="ListHandler-to-ObjectListHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="231.11,834.97,238.382,828.3279,233.1141,830.3892,231.0527,825.1213,231.11,834.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="253" y="802">succe [...]
+link ObjectListHandler to LayoutHandler--><path codeLine="29" d="M205.95,883.14 C192.54,903.75 172.91,933.94 158.74,955.73 " fill="none" id="ObjectListHandler-to-LayoutHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="155.98,959.97,164.2457,954.6149,158.7105,955.7814,157.5439,950.2461,155.98,959.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="187" y="927"> [...]
+link LayoutHandler to DefaultHandler--><path codeLine="30" d="M126.14,1008.14 C112.9,1028.75 93.51,1058.94 79.52,1080.73 " fill="none" id="LayoutHandler-to-DefaultHandler" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="76.79,1084.97,85.0132,1079.5497,79.4873,1080.7599,78.2771,1075.2341,76.79,1084.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="108" y="1052">succ [...]
 @startuml
 interface IHandler {
     handle()
@@ -58,7 +58,7 @@ ObjectListHandler - ->  LayoutHandler : successor
 LayoutHandler - ->  DefaultHandler : successor
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-328cea0587916b9d66e4f95fc3432200f8204eff.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-328cea0587916b9d66e4f95fc3432200f8204eff.svg
index acaa8c4..add75c5 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-328cea0587916b9d66e4f95fc3432200f8204eff.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-328cea0587916b9d66e4f95fc3432200f8204eff.svg
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="548px" preserveAspectRatio="none" style="width:729px;height:548px;" version="1.1" viewBox="0 0 729 548" width="729px" zoomAndPan="magnify"><defs><filter height="300%" id="fr9tah8j9a011" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMa [...]
-class Renderer--><rect codeLine="2" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="107.3828" id="Renderer" style="stroke:#A80036;stroke-width:1.5;" width="95" x="281.5" y="164"/><ellipse cx="304.6" cy="180" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M304.6469,174.1719 L304.6781,174.1719 L303.6625,180.25 L305.6625,180.25 L304.6469,174.1719 Z M306.0688,182.125 L303.2563,182.125 L302.4594,185.7031 L300.3344,185.7031 L303.5844,172.5938 L305.8031,17 [...]
-class Protocol--><rect codeLine="10" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="62.8457" id="Protocol" style="stroke:#A80036;stroke-width:1.5;" width="161" x="439.5" y="186"/><ellipse cx="494.75" cy="202" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M494.7969,196.1719 L494.8281,196.1719 L493.8125,202.25 L495.8125,202.25 L494.7969,196.1719 Z M496.2188,204.125 L493.4063,204.125 L492.6094,207.7031 L490.4844,207.7031 L493.7344,194.5938 L495.9531, [...]
-class ObjectRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ObjectRdr" style="stroke:#A80036;stroke-width:1.5;" width="82" x="252" y="354.5"/><ellipse cx="267" cy="370.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M262.9375,370.6406 Q262.9375,367.1875 264.0313,365.5625 Q265.1406,363.9219 267.3594,363.9219 Q268.5625,363.9219 269.8281,364.5781 L269.8281,366.625 Q268.375,365.8438 267.4375,365.8438 Q264.9844,365.8438 264.9844,370 [...]
-class ListRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ListRdr" style="stroke:#A80036;stroke-width:1.5;" width="68" x="369" y="354.5"/><ellipse cx="384" cy="370.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M379.9375,370.6406 Q379.9375,367.1875 381.0313,365.5625 Q382.1406,363.9219 384.3594,363.9219 Q385.5625,363.9219 386.8281,364.5781 L386.8281,366.625 Q385.375,365.8438 384.4375,365.8438 Q381.9844,365.8438 381.9844,370.640 [...]
-class GeoLocationRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="GeoLocationRdr" style="stroke:#A80036;stroke-width:1.5;" width="112" x="327" y="486"/><ellipse cx="342" cy="502" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M337.9375,502.1406 Q337.9375,498.6875 339.0313,497.0625 Q340.1406,495.4219 342.3594,495.4219 Q343.5625,495.4219 344.8281,496.0781 L344.8281,498.125 Q343.375,497.3438 342.4375,497.3438 Q339.9844,497.3438 339.9 [...]
-class EventRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="EventRdr" style="stroke:#A80036;stroke-width:1.5;" width="77" x="474.5" y="486"/><ellipse cx="489.5" cy="502" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M485.4375,502.1406 Q485.4375,498.6875 486.5313,497.0625 Q487.6406,495.4219 489.8594,495.4219 Q491.0625,495.4219 492.3281,496.0781 L492.3281,498.125 Q490.875,497.3438 489.9375,497.3438 Q487.4844,497.3438 487.4844,502.1 [...]
-class RoView--><rect codeLine="19" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="RoView" style="stroke:#A80036;stroke-width:1.5;" width="69" x="149.5" y="193.5"/><ellipse cx="164.5" cy="209.5" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M164.5469,203.6719 L164.5781,203.6719 L163.5625,209.75 L165.5625,209.75 L164.5469,203.6719 Z M165.9688,211.625 L163.1563,211.625 L162.3594,215.2031 L160.2344,215.2031 L163.4844,202.0938 L165.7031,202.093 [...]
-class ObjectVw--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ObjectVw" style="stroke:#A80036;stroke-width:1.5;" width="80" x="36" y="354.5"/><ellipse cx="51" cy="370.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M46.9375,370.6406 Q46.9375,367.1875 48.0313,365.5625 Q49.1406,363.9219 51.3594,363.9219 Q52.5625,363.9219 53.8281,364.5781 L53.8281,366.625 Q52.375,365.8438 51.4375,365.8438 Q48.9844,365.8438 48.9844,370.6406 Q48.9844,3 [...]
-class ListVw--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ListVw" style="stroke:#A80036;stroke-width:1.5;" width="66" x="151" y="354.5"/><ellipse cx="166" cy="370.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M161.9375,370.6406 Q161.9375,367.1875 163.0313,365.5625 Q164.1406,363.9219 166.3594,363.9219 Q167.5625,363.9219 168.8281,364.5781 L168.8281,366.625 Q167.375,365.8438 166.4375,365.8438 Q163.9844,365.8438 163.9844,370.6406  [...]
-class GeoLocationVw--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="GeoLocationVw" style="stroke:#A80036;stroke-width:1.5;" width="110" x="7" y="486"/><ellipse cx="22" cy="502" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M17.9375,502.1406 Q17.9375,498.6875 19.0313,497.0625 Q20.1406,495.4219 22.3594,495.4219 Q23.5625,495.4219 24.8281,496.0781 L24.8281,498.125 Q23.375,497.3438 22.4375,497.3438 Q19.9844,497.3438 19.9844,502.1406 Q19. [...]
-class TimeLineView--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="TimeLineView" style="stroke:#A80036;stroke-width:1.5;" width="102" x="152" y="486"/><ellipse cx="167" cy="502" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M162.9375,502.1406 Q162.9375,498.6875 164.0313,497.0625 Q165.1406,495.4219 167.3594,495.4219 Q168.5625,495.4219 169.8281,496.0781 L169.8281,498.125 Q168.375,497.3438 167.4375,497.3438 Q164.9844,497.3438 164.9844, [...]
-class Exposer--><rect codeLine="29" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="62.8457" id="Exposer" style="stroke:#A80036;stroke-width:1.5;" width="129" x="455.5" y="14.5"/><ellipse cx="496.15" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M492.0875,30.6406 Q492.0875,27.1875 493.1813,25.5625 Q494.2906,23.9219 496.5094,23.9219 Q497.7125,23.9219 498.9781,24.5781 L498.9781,26.625 Q497.525,25.8438 496.5875,25.8438 Q494.1344,25.8438 494. [...]
-class TransferObject--><rect codeLine="33" fill="#90EE90" filter="url(#fr9tah8j9a011)" height="62.8457" id="TransferObject" style="stroke:#A80036;stroke-width:1.5;" width="140" x="280" y="14.5"/><ellipse cx="309.85" cy="30.5" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M309.8969,24.6719 L309.9281,24.6719 L308.9125,30.75 L310.9125,30.75 L309.8969,24.6719 Z M311.3188,32.625 L308.5063,32.625 L307.7094,36.2031 L305.5844,36.2031 L308.8344,23.0938 L311.053 [...]
-class Property--><rect codeLine="37" fill="#ADD8E6" filter="url(#fr9tah8j9a011)" height="77.6914" id="Property" style="stroke:#A80036;stroke-width:1.5;" width="75" x="147.5" y="7"/><ellipse cx="162.95" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M158.8875,23.1406 Q158.8875,19.6875 159.9813,18.0625 Q161.0906,16.4219 163.3094,16.4219 Q164.5125,16.4219 165.7781,17.0781 L165.7781,19.125 Q164.325,18.3438 163.3875,18.3438 Q160.9344,18.3438 160.9344 [...]
-class TimeLinePtc--><rect codeLine="44" fill="#ADD8E6" filter="url(#fr9tah8j9a011)" height="92.5371" id="TimeLinePtc" style="stroke:#A80036;stroke-width:1.5;" width="95" x="472.5" y="332"/><ellipse cx="487.5" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M483.4375,348.1406 Q483.4375,344.6875 484.5313,343.0625 Q485.6406,341.4219 487.8594,341.4219 Q489.0625,341.4219 490.3281,342.0781 L490.3281,344.125 Q488.875,343.3438 487.9375,343.3438 Q485.484 [...]
-class GeoLocationPtc--><rect codeLine="49" fill="#ADD8E6" filter="url(#fr9tah8j9a011)" height="77.6914" id="GeoLocationPtc" style="stroke:#A80036;stroke-width:1.5;" width="112" x="603" y="339.5"/><ellipse cx="618" cy="355.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M613.9375,355.6406 Q613.9375,352.1875 615.0313,350.5625 Q616.1406,348.9219 618.3594,348.9219 Q619.5625,348.9219 620.8281,349.5781 L620.8281,351.625 Q619.375,350.8438 618.4375,350.8438 Q [...]
-link Renderer to Protocol--><path codeLine="8" d="M376.75,217.5 C395.85,217.5 414.94,217.5 434.04,217.5 " fill="none" id="Renderer-to-Protocol" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="439.42,217.5,430.42,213.5,434.42,217.5,430.42,221.5,439.42,217.5" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3cb176c019a1793214f32deabd48c781]
-reverse link Renderer to ObjectRdr--><path codeLine="14" d="M312.63,290.78 C307.43,313.75 302.05,337.53 298.24,354.36 " fill="none" id="Renderer-backto-ObjectRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="305.87,288.96,317.11,271,319.52,292.06,305.87,288.96" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2d003ea05eff3833a625365fa4a23c92]
-reverse link Renderer to ListRdr--><path codeLine="15" d="M361.99,289.39 C372.88,312.79 384.24,337.19 392.23,354.36 " fill="none" id="Renderer-backto-ListRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="355.53,292.09,353.44,271,368.22,286.18,355.53,292.09" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[270c2e783ce252c6a17b4cdda7eeb367]
-reverse link ListRdr to GeoLocationRdr--><path codeLine="16" d="M396.36,422.52 C393.11,443.56 389.32,468.07 386.61,485.61 " fill="none" id="ListRdr-backto-GeoLocationRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="389.45,421.35,399.42,402.65,403.29,423.49,389.45,421.35" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5fa14edd34496078a462d0f43443cad0]
-reverse link ListRdr to EventRdr--><path codeLine="17" d="M435.66,417.95 C454.33,439.93 477.14,466.79 493.13,485.61 " fill="none" id="ListRdr-backto-EventRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="430.28,422.43,422.67,402.65,440.95,413.36,430.28,422.43" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ed7825cf26eab76999869bbf1a2f89e6]
-reverse link RoView to ObjectVw--><path codeLine="22" d="M156.84,258.49 C136.28,288.75 108.77,329.26 91.72,354.35 " fill="none" id="RoView-backto-ObjectVw" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="151.27,254.23,168.3,241.62,162.85,262.1,151.27,254.23" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[216093aafde1c45b2e5b0712ff058d71]
-reverse link RoView to ListVw--><path codeLine="23" d="M184,261.94 C184,291.77 184,330.2 184,354.35 " fill="none" id="RoView-backto-ListVw" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="177,261.62,184,241.62,191,261.62,177,261.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[4f43e277fa3c3b5869da3b3235ceba62]
-reverse link ListVw to GeoLocationVw--><path codeLine="24" d="M148.38,417.31 C127.56,439.41 101.94,466.6 84.03,485.61 " fill="none" id="ListVw-backto-GeoLocationVw" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="143.38,412.41,162.19,402.65,153.57,422.01,143.38,412.41" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1436f1ec751da39d0b8ebbe47b3dd9e6]
-reverse link ListVw to TimeLineView--><path codeLine="25" d="M190.31,422.52 C193.4,443.56 196.99,468.07 199.57,485.61 " fill="none" id="ListVw-backto-TimeLineView" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="183.37,423.46,187.4,402.65,197.23,421.42,183.37,423.46" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d87128cbb67638ba9a85a96e24c98396]
-reverse link RoView to Renderer--><path codeLine="27" d="M223.93,217.5 C242.99,217.5 262.05,217.5 281.11,217.5 " fill="none" id="RoView-backto-Renderer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="218.55,217.5,227.55,221.5,223.55,217.5,227.55,213.5,218.55,217.5" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7f100461146c8f8905a6594a925a30e1]
-reverse link TransferObject to Exposer--><path codeLine="36" d="M425.27,46 C435.25,46 445.22,46 455.19,46 " fill="none" id="TransferObject-backto-Exposer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="420.06,46,429.06,50,425.06,46,429.06,42,420.06,46" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ca8c0f72eda8f7f565b74e74c1e8a3d2]
-link Property to TransferObject--><path codeLine="41" d="M222.85,46 C235.95,46 251.2,46 266.49,46 " fill="none" id="Property-to-TransferObject" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="279.89,46,273.89,42,267.89,46,273.89,50,279.89,46" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="240.75" y="38.6855">has</text><!--MD5=[b98afa943d79ecfbff6cd27acaf81a75]
-link Exposer to Protocol--><path codeLine="42" d="M520,77.7 C520,106.64 520,150.03 520,180.58 " fill="none" id="Exposer-to-Protocol" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="520,185.75,524,176.75,520,180.75,516,176.75,520,185.75" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="128" x="521" y="129.6855">delegate.conformsTo()</text><!--MD5=[49f8108e56dec56423f64f1d301d4747]
-reverse link Protocol to GeoLocationPtc--><path codeLine="53" d="M560.06,264.32 C580.84,288.1 605.94,316.8 625.65,339.35 " fill="none" id="Protocol-backto-GeoLocationPtc" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="554.69,268.82,546.8,249.16,565.23,259.61,554.69,268.82" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[8b653c0a697b1fbb7536d936f8568711]
-reverse link Protocol to TimeLinePtc--><path codeLine="54" d="M520,269.21 C520,289.33 520,312.29 520,331.88 " fill="none" id="Protocol-backto-TimeLinePtc" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="513,269.16,520,249.16,527,269.16,513,269.16" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[369c50745aeef53d07c3d5415db80bb2]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="531px" preserveAspectRatio="none" style="width:748px;height:531px;" version="1.1" viewBox="0 0 748 531" width="748px" zoomAndPan="magnify"><defs><filter height="300%" id="fr9tah8j9a011" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMa [...]
+class Renderer--><rect codeLine="2" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="100.7996" id="Renderer" style="stroke:#A80036;stroke-width:1.5;" width="94" x="295" y="158"/><ellipse cx="314.95" cy="174" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M315.9031,177.6563 Q315.9031,177.1563 316.1844,176.9844 Q316.4813,176.7969 317.0281,176.7969 L317.4188,176.7969 L317.0281,175.8125 L312.9813,175.8125 L312.5906,176.7969 L312.9813,176.7969 Q314.0906,1 [...]
+class Protocol--><rect codeLine="10" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="61.1999" id="Protocol" style="stroke:#A80036;stroke-width:1.5;" width="159" x="456.5" y="178"/><ellipse cx="509.25" cy="194" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M510.2031,197.6563 Q510.2031,197.1563 510.4844,196.9844 Q510.7813,196.7969 511.3281,196.7969 L511.7188,196.7969 L511.3281,195.8125 L507.2813,195.8125 L506.8906,196.7969 L507.2813,196.7969 Q508.390 [...]
+class ObjectRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ObjectRdr" style="stroke:#A80036;stroke-width:1.5;" width="86" x="259" y="340"/><ellipse cx="274" cy="356" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M273.3594,359.7813 Q274.1563,359.7813 274.7188,359.5938 Q275.2969,359.3906 275.5313,359.1719 Q275.7813,358.9375 276.0156,358.75 Q276.2656,358.5469 276.4844,358.5469 Q276.8281,358.5469 277.0781,358.8125 Q277.3438,359.062 [...]
+class ListRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ListRdr" style="stroke:#A80036;stroke-width:1.5;" width="71" x="380.5" y="340"/><ellipse cx="395.5" cy="356" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M394.8594,359.7813 Q395.6563,359.7813 396.2188,359.5938 Q396.7969,359.3906 397.0313,359.1719 Q397.2813,358.9375 397.5156,358.75 Q397.7656,358.5469 397.9844,358.5469 Q398.3281,358.5469 398.5781,358.8125 Q398.8438,359.062 [...]
+class GeoLocationRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="GeoLocationRdr" style="stroke:#A80036;stroke-width:1.5;" width="117" x="337.5" y="469"/><ellipse cx="352.5" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M351.8594,488.7813 Q352.6563,488.7813 353.2188,488.5938 Q353.7969,488.3906 354.0313,488.1719 Q354.2813,487.9375 354.5156,487.75 Q354.7656,487.5469 354.9844,487.5469 Q355.3281,487.5469 355.5781,487.8125 Q3 [...]
+class EventRdr--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="EventRdr" style="stroke:#A80036;stroke-width:1.5;" width="81" x="489.5" y="469"/><ellipse cx="504.5" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M503.8594,488.7813 Q504.6563,488.7813 505.2188,488.5938 Q505.7969,488.3906 506.0313,488.1719 Q506.2813,487.9375 506.5156,487.75 Q506.7656,487.5469 506.9844,487.5469 Q507.3281,487.5469 507.5781,487.8125 Q507.8438,488.0 [...]
+class RoView--><rect codeLine="19" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="RoView" style="stroke:#A80036;stroke-width:1.5;" width="75" x="152.5" y="184.5"/><ellipse cx="167.5" cy="200.5" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M168.4531,204.1563 Q168.4531,203.6563 168.7344,203.4844 Q169.0313,203.2969 169.5781,203.2969 L169.9688,203.2969 L169.5781,202.3125 L165.5313,202.3125 L165.1406,203.2969 L165.5313,203.2969 Q166.6406,203.2 [...]
+class ObjectVw--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ObjectVw" style="stroke:#A80036;stroke-width:1.5;" width="83" x="37.5" y="340"/><ellipse cx="52.5" cy="356" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M51.8594,359.7813 Q52.6563,359.7813 53.2188,359.5938 Q53.7969,359.3906 54.0313,359.1719 Q54.2813,358.9375 54.5156,358.75 Q54.7656,358.5469 54.9844,358.5469 Q55.3281,358.5469 55.5781,358.8125 Q55.8438,359.0625 55.8438,35 [...]
+class ListVw--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="ListVw" style="stroke:#A80036;stroke-width:1.5;" width="68" x="156" y="340"/><ellipse cx="171" cy="356" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M170.3594,359.7813 Q171.1563,359.7813 171.7188,359.5938 Q172.2969,359.3906 172.5313,359.1719 Q172.7813,358.9375 173.0156,358.75 Q173.2656,358.5469 173.4844,358.5469 Q173.8281,358.5469 174.0781,358.8125 Q174.3438,359.0625 174. [...]
+class GeoLocationVw--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="GeoLocationVw" style="stroke:#A80036;stroke-width:1.5;" width="114" x="7" y="469"/><ellipse cx="22" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M21.3594,488.7813 Q22.1563,488.7813 22.7188,488.5938 Q23.2969,488.3906 23.5313,488.1719 Q23.7813,487.9375 24.0156,487.75 Q24.2656,487.5469 24.4844,487.5469 Q24.8281,487.5469 25.0781,487.8125 Q25.3438,488.0625 25.3 [...]
+class TimeLineView--><rect fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="48" id="TimeLineView" style="stroke:#A80036;stroke-width:1.5;" width="107" x="156.5" y="469"/><ellipse cx="171.5" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M170.8594,488.7813 Q171.6563,488.7813 172.2188,488.5938 Q172.7969,488.3906 173.0313,488.1719 Q173.2813,487.9375 173.5156,487.75 Q173.7656,487.5469 173.9844,487.5469 Q174.3281,487.5469 174.5781,487.8125 Q174.8 [...]
+class Exposer--><rect codeLine="29" fill="#FEFECE" filter="url(#fr9tah8j9a011)" height="61.1999" id="Exposer" style="stroke:#A80036;stroke-width:1.5;" width="130" x="471" y="13.5"/><ellipse cx="510.75" cy="29.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M510.1094,33.2813 Q510.9063,33.2813 511.4688,33.0938 Q512.0469,32.8906 512.2813,32.6719 Q512.5313,32.4375 512.7656,32.25 Q513.0156,32.0469 513.2344,32.0469 Q513.5781,32.0469 513.8281,32.3125 Q514.09 [...]
+class TransferObject--><rect codeLine="33" fill="#90EE90" filter="url(#fr9tah8j9a011)" height="61.1999" id="TransferObject" style="stroke:#A80036;stroke-width:1.5;" width="132" x="304" y="13.5"/><ellipse cx="328.45" cy="29.5" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M329.4031,33.1563 Q329.4031,32.6563 329.6844,32.4844 Q329.9813,32.2969 330.5281,32.2969 L330.9188,32.2969 L330.5281,31.3125 L326.4813,31.3125 L326.0906,32.2969 L326.4813,32.2969 Q327.5 [...]
+class Property--><rect codeLine="37" fill="#ADD8E6" filter="url(#fr9tah8j9a011)" height="74.3998" id="Property" style="stroke:#A80036;stroke-width:1.5;" width="76" x="171" y="7"/><ellipse cx="186" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M185.3594,26.7813 Q186.1563,26.7813 186.7188,26.5938 Q187.2969,26.3906 187.5313,26.1719 Q187.7813,25.9375 188.0156,25.75 Q188.2656,25.5469 188.4844,25.5469 Q188.8281,25.5469 189.0781,25.8125 Q189.3438,26.0 [...]
+class TimeLinePtc--><rect codeLine="44" fill="#ADD8E6" filter="url(#fr9tah8j9a011)" height="87.5997" id="TimeLinePtc" style="stroke:#A80036;stroke-width:1.5;" width="98" x="487" y="320"/><ellipse cx="502" cy="336" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M501.3594,339.7813 Q502.1563,339.7813 502.7188,339.5938 Q503.2969,339.3906 503.5313,339.1719 Q503.7813,338.9375 504.0156,338.75 Q504.2656,338.5469 504.4844,338.5469 Q504.8281,338.5469 505.0781,338 [...]
+class GeoLocationPtc--><rect codeLine="49" fill="#ADD8E6" filter="url(#fr9tah8j9a011)" height="74.3998" id="GeoLocationPtc" style="stroke:#A80036;stroke-width:1.5;" width="114" x="620" y="327"/><ellipse cx="635" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M634.3594,346.7813 Q635.1563,346.7813 635.7188,346.5938 Q636.2969,346.3906 636.5313,346.1719 Q636.7813,345.9375 637.0156,345.75 Q637.2656,345.5469 637.4844,345.5469 Q637.8281,345.5469 638.0 [...]
+link Renderer to Protocol--><path codeLine="8" d="M389.36,208.5 C409.96,208.5 430.55,208.5 451.15,208.5 " fill="none" id="Renderer-to-Protocol" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="456.38,208.5,447.38,204.5,451.38,208.5,447.38,212.5,456.38,208.5" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3cb176c019a1793214f32deabd48c781]
+reverse link Renderer to ObjectRdr--><path codeLine="14" d="M323.96,278.72 C318.22,300.77 312.25,323.65 307.99,340 " fill="none" id="Renderer-backto-ObjectRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="317.2,276.93,329.01,259.34,330.74,280.46,317.2,276.93" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2d003ea05eff3833a625365fa4a23c92]
+reverse link Renderer to ListRdr--><path codeLine="15" d="M374.72,277.38 C385.55,299.83 396.87,323.32 404.91,340 " fill="none" id="Renderer-backto-ListRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="368.41,280.39,366.03,259.34,381.02,274.31,368.41,280.39" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[270c2e783ce252c6a17b4cdda7eeb367]
+reverse link ListRdr to GeoLocationRdr--><path codeLine="16" d="M409.18,408.3 C405.98,428.6 402.3,451.97 399.65,468.85 " fill="none" id="ListRdr-backto-GeoLocationRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="402.31,406.96,412.33,388.29,416.14,409.14,402.31,406.96" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5fa14edd34496078a462d0f43443cad0]
+reverse link ListRdr to EventRdr--><path codeLine="17" d="M450.3,403.21 C469.49,424.59 492.79,450.55 509.22,468.85 " fill="none" id="ListRdr-backto-EventRdr" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="445.06,407.85,436.91,388.29,455.48,398.5,445.06,407.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ed7825cf26eab76999869bbf1a2f89e6]
+reverse link RoView to ObjectVw--><path codeLine="22" d="M161.17,249.36 C140.35,278.16 112.95,316.05 95.65,339.97 " fill="none" id="RoView-backto-ObjectVw" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="155.75,244.92,173.14,232.81,167.09,253.12,155.75,244.92" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[216093aafde1c45b2e5b0712ff058d71]
+reverse link RoView to ListVw--><path codeLine="23" d="M190,253.08 C190,281.35 190,317.06 190,339.97 " fill="none" id="RoView-backto-ListVw" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="183,252.81,190,232.81,197,252.81,183,252.81" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[4f43e277fa3c3b5869da3b3235ceba62]
+reverse link ListVw to GeoLocationVw--><path codeLine="24" d="M152.71,402.59 C131.38,424.09 105.31,450.37 86.96,468.85 " fill="none" id="ListVw-backto-GeoLocationVw" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="147.83,397.56,166.89,388.29,157.77,407.42,147.83,397.56" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1436f1ec751da39d0b8ebbe47b3dd9e6]
+reverse link ListVw to TimeLineView--><path codeLine="25" d="M196.82,408.3 C200.02,428.6 203.7,451.97 206.35,468.85 " fill="none" id="ListVw-backto-TimeLineView" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="189.86,409.14,193.67,388.29,203.69,406.96,189.86,409.14" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d87128cbb67638ba9a85a96e24c98396]
+reverse link RoView to Renderer--><path codeLine="27" d="M232.94,208.5 C253.51,208.5 274.09,208.5 294.67,208.5 " fill="none" id="RoView-backto-Renderer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="227.7,208.5,236.7,212.5,232.7,208.5,236.7,204.5,227.7,208.5" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7f100461146c8f8905a6594a925a30e1]
+reverse link TransferObject to Exposer--><path codeLine="36" d="M441.29,44 C451.15,44 461,44 470.86,44 " fill="none" id="TransferObject-backto-Exposer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="436.14,44,445.14,48,441.14,44,445.14,40,436.14,44" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ca8c0f72eda8f7f565b74e74c1e8a3d2]
+link Property to TransferObject--><path codeLine="41" d="M247.15,44 C260.24,44 275.42,44 290.55,44 " fill="none" id="Property-to-TransferObject" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="303.78,44,297.78,40,291.78,44,297.78,48,303.78,44" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="20" x="265.5" y="38">has</text><!--MD5=[b98afa943d79ecfbff6cd27acaf81a75]
+link Exposer to Protocol--><path codeLine="42" d="M536,74.81 C536,102.41 536,143.47 536,172.59 " fill="none" id="Exposer-to-Protocol" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="536,177.88,540,168.88,536,172.88,532,168.88,536,177.88" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="128" x="537" y="125">delegate.conformsTo()</text><!--MD5=[49f8108e56dec56423f64f1d301d4747]
+reverse link Protocol to GeoLocationPtc--><path codeLine="53" d="M576.73,253.85 C597.98,276.97 623.64,304.91 643.69,326.73 " fill="none" id="Protocol-backto-GeoLocationPtc" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="571.56,258.56,563.19,239.1,581.87,249.09,571.56,258.56" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[8b653c0a697b1fbb7536d936f8568711]
+reverse link Protocol to TimeLinePtc--><path codeLine="54" d="M536,259.32 C536,278.84 536,301.02 536,319.85 " fill="none" id="Protocol-backto-TimeLinePtc" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="529,259.1,536,239.1,543,259.1,529,259.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[9b174d5a9656902bbc9aa48b63d909f1]
 @startuml
 
 abstract class Renderer {
@@ -88,7 +88,7 @@ Protocol <|-down- TimeLinePtc
 
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-56e486c665357e8d145d01577626bc6931b28aec.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-56e486c665357e8d145d01577626bc6931b28aec.svg
index 8543b06..1221e92 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-56e486c665357e8d145d01577626bc6931b28aec.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-56e486c665357e8d145d01577626bc6931b28aec.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1069px" preserveAspectRatio="none" style="width:1248px;height:1069px;" version="1.1" viewBox="0 0 1248 1069" width="1248px" zoomAndPan="magnify"><defs><filter height="300%" id="fe85mlu2qz5w7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feC [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1015px" preserveAspectRatio="none" style="width:1246px;height:1015px;" version="1.1" viewBox="0 0 1246 1015" width="1246px" zoomAndPan="magnify"><defs><filter height="300%" id="fe85mlu2qz5w7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feC [...]
 @startuml
 
 actor User
@@ -56,7 +56,7 @@ UI -> User : present
 
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-73fd787032f3e51ea8488f6ac0c31604b524e04b.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-73fd787032f3e51ea8488f6ac0c31604b524e04b.svg
index d480313..8242639 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-73fd787032f3e51ea8488f6ac0c31604b524e04b.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-73fd787032f3e51ea8488f6ac0c31604b524e04b.svg
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="555px" preserveAspectRatio="none" style="width:1703px;height:555px;" version="1.1" viewBox="0 0 1703 555" width="1703px" zoomAndPan="magnify"><defs><filter height="300%" id="fqryl9qhb0ple" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColo [...]
-cluster FE--><rect fill="#FFFFFF" filter="url(#fqryl9qhb0ple)" height="176" style="stroke:#000000;stroke-width:1.5;" width="143" x="96" y="63.07"/><rect fill="#FFFFFF" height="10" style="stroke:#000000;stroke-width:1.5;" width="15" x="219" y="68.07"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="217" y="70.07"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="217" y="74.07"/><text fill="#000000" font-family="san [...]
-entity EL--><path d="M139,177.07 C139,167.07 177,167.07 177,167.07 C177,167.07 215,167.07 215,177.07 L215,204.9645 C215,214.9645 177,214.9645 177,214.9645 C177,214.9645 139,214.9645 139,204.9645 L139,177.07 " fill="#FEFECE" filter="url(#fqryl9qhb0ple)" style="stroke:#000000;stroke-width:1.5;"/><path d="M139,177.07 C139,187.07 177,187.07 177,187.07 C177,187.07 215,187.07 215,177.07 " fill="none" style="stroke:#000000;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-s [...]
-entity RE--><polygon fill="#FEFECE" filter="url(#fqryl9qhb0ple)" points="396.5,148.57,396.5,233.2536,1437.5,233.2536,1437.5,158.57,1427.5,148.57,396.5,148.57" style="stroke:#000000;stroke-width:1.5;"/><path d="M1427.5,148.57 L1427.5,158.57 L1437.5,158.57 " fill="#FEFECE" style="stroke:#000000;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="15" x="410.5" y="194.2028">url</text><text fill="#000000" font- [...]
-entity DRT--><rect fill="#FEFECE" filter="url(#fqryl9qhb0ple)" height="86.6836" style="stroke:#A80036;stroke-width:1.5;" width="113" x="1506.5" y="147.57"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="1599.5" y="152.57"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="1597.5" y="154.57"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="1597.5" y="158.57"/><text fill="#000 [...]
-entity  --><ellipse cx="19" cy="168.07" fill="#FEFECE" filter="url(#fqryl9qhb0ple)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M19,176.07 L19,203.07 M6,184.07 L32,184.07 M19,203.07 L6,218.07 M19,203.07 L32,218.07 " fill="none" filter="url(#fqryl9qhb0ple)" style="stroke:#A80036;stroke-width:1.5;"/><path d="M108,323.57 L108,386.2048 A0,0 0 0 0 108,386.2048 L242,386.2048 A0,0 0 0 0 242,386.2048 L242,333.57 L232,323.57 L179.38,323.57 L176.71,215.28 L171.38,323.57 L108,3 [...]
-entity APP--><rect fill="#FEFECE" filter="url(#fqryl9qhb0ple)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="98" x="263" y="157.07"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="341" y="162.07"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="339" y="164.07"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="339" y="168.07"/><text fill="#000000" font-fam [...]
-entity FW--><rect fill="#FEFECE" filter="url(#fqryl9qhb0ple)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="164" x="362" y="473.57"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="506" y="478.57"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="504" y="480.57"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="504" y="484.57"/><text fill="#000000" font-fam [...]
-link   to FE--><path d="M33.81,191.07 C45.225,191.07 61.36,191.07 75.2825,191.07 C82.2438,191.07 88.6519,191.07 93.6403,191.07 C94.2639,191.07 94.8652,191.07 95.4427,191.07 C95.5871,191.07 95.73,191.07 95.8714,191.07 " fill="none" id=" -to-FE" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="95.8714,191.07,86.8714,187.07,90.8714,191.07,86.8714,195.07,95.8714,191.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size= [...]
-link FE to EL--><path d="M104.57,191.07 C114.29,191.07 124.01,191.07 133.72,191.07 " fill="none" id="FE-to-EL" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="138.8,191.07,129.8,187.07,133.8,191.07,129.8,195.07,138.8,191.07" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2c760634608609d01a798da024c32d51]
-link FE to APP--><path d="M119.1822,62.6786 C120.3939,61.4301 121.6656,60.2259 123,59.07 C159.28,27.64 189.11,35.63 231,59.07 C266.19,78.76 287.95,120.69 299.94,152.03 " fill="none" id="FE-APP" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="301.78,156.97,302.3652,147.1385,300.0244,152.2884,294.8746,149.9475,301.78,156.97" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="119.1822,62.6786,128.3206,59.0057,122.6644,59.0905,122.5796,53.4343 [...]
-link APP to FW--><path d="M307.05,225.27 C301.95,270.44 298.61,352.48 330,412.57 C342.08,435.7 362.56,455.29 382.85,470.5 " fill="none" id="APP-to-FW" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="386.91,473.48,382.0414,464.9186,382.8862,470.5121,377.2927,471.3568,386.91,473.48" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="331" y="360.2555">uses</text><!--MD5=[8 [...]
-link EL to RE--><path d="M185.04,166.95 C195.8,136.9 216.97,84.9 246,47.07 C277.51,6 310.24,24.88 361.5,32.07 C515.91,53.73 687.61,107.71 798.67,146.77 " fill="none" id="EL-to-RE" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="803.59,148.5,796.4258,141.7417,798.8729,146.8419,793.7728,149.289,803.59,148.5" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="746.908" y="1 [...]
-reverse link RE to DRT--><path d="M1442.84,191.07 C1466.87,191.07 1488.38,191.07 1506.33,191.07 " fill="none" id="RE-backto-DRT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1437.68,191.07,1446.68,195.07,1442.68,191.07,1446.68,187.07,1437.68,191.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="1456" y="183.7555">reads</text><!--MD5=[5ea144c57fb525e20369093d1f53f308]
-link DRT to APP--><path d="M1541.01,147.54 C1522.68,116.54 1493.4,77.27 1455,59.07 C1401.03,33.5 430.99,27.98 380,59.07 C347.09,79.13 329.43,120.78 320.43,151.96 " fill="none" id="DRT-to-APP" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="319.06,156.87,325.3519,149.2929,320.4166,152.0576,317.652,147.1223,319.06,156.87" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="33" x= [...]
-link APP to NREG--><path d="M339.03,225.24 C365.13,257.27 403.89,304.84 426.28,332.33 " fill="none" id="APP-NREG" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[08c403ccfe222087d529d28b9c140709]
-link NREG to FW--><path d="M444,377.63 C444,402.67 444,444.24 444,473.4 " fill="none" id="NREG-FW" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[b51f0ff5928066381642b8cd9eb5a59a]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="538px" preserveAspectRatio="none" style="width:1710px;height:538px;" version="1.1" viewBox="0 0 1710 538" width="1710px" zoomAndPan="magnify"><defs><filter height="300%" id="fqryl9qhb0ple" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColo [...]
+cluster FE--><rect fill="#FFFFFF" filter="url(#fqryl9qhb0ple)" height="166" style="stroke:#000000;stroke-width:1.5;" width="145" x="97" y="73.8"/><rect fill="#FFFFFF" height="10" style="stroke:#000000;stroke-width:1.5;" width="15" x="222" y="78.8"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="220" y="80.8"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="220" y="84.8"/><text fill="#000000" font-family="sans-se [...]
+entity EL--><path d="M140,179.8 C140,169.8 179,169.8 179,169.8 C179,169.8 218,169.8 218,179.8 L218,205.5999 C218,215.5999 179,215.5999 179,215.5999 C179,215.5999 140,215.5999 140,205.5999 L140,179.8 " fill="#FEFECE" filter="url(#fqryl9qhb0ple)" style="stroke:#000000;stroke-width:1.5;"/><path d="M140,179.8 C140,189.8 179,189.8 179,189.8 C179,189.8 218,189.8 218,179.8 " fill="none" style="stroke:#000000;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" length [...]
+entity RE--><polygon fill="#FEFECE" filter="url(#fqryl9qhb0ple)" points="403.5,153.8,403.5,232.1998,1448.5,232.1998,1448.5,163.8,1438.5,153.8,403.5,153.8" style="stroke:#000000;stroke-width:1.5;"/><path d="M1438.5,153.8 L1438.5,163.8 L1448.5,163.8 " fill="#FEFECE" style="stroke:#000000;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="417.5" y="196.5999">url</text><text fill="#000000" font-family= [...]
+entity DRT--><rect fill="#FEFECE" filter="url(#fqryl9qhb0ple)" height="80.3998" style="stroke:#A80036;stroke-width:1.5;" width="113" x="1516.5" y="152.8"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="1609.5" y="157.8"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="1607.5" y="159.8"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="1607.5" y="163.8"/><text fill="#000000" [...]
+entity  --><ellipse cx="19" cy="169.8" fill="#FEFECE" filter="url(#fqryl9qhb0ple)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M19,177.8 L19,204.8 M6,185.8 L32,185.8 M19,204.8 L6,219.8 M19,204.8 L32,219.8 " fill="none" filter="url(#fqryl9qhb0ple)" style="stroke:#A80036;stroke-width:1.5;"/><path d="M113,319.3 L113,376.1 A0,0 0 0 0 113,376.1 L245,376.1 A0,0 0 0 0 245,376.1 L245,329.3 L235,319.3 L183,319.3 L179,216.05 L175,319.3 L113,319.3 A0,0 0 0 0 113,319.3 " fill="# [...]
+entity APP--><rect fill="#FEFECE" filter="url(#fqryl9qhb0ple)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="102" x="266" y="160.8"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="348" y="165.8"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="346" y="167.8"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="346" y="171.8"/><text fill="#000000" font-family [...]
+entity FW--><rect fill="#FEFECE" filter="url(#fqryl9qhb0ple)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="170" x="360" y="460.8"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="510" y="465.8"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="508" y="467.8"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="508" y="471.8"/><text fill="#000000" font-family= [...]
+link   to FE--><path d="M33.59,192.8 C45.09,192.8 61.5,192.8 75.69,192.8 C82.785,192.8 89.325,192.8 94.4187,192.8 C95.0555,192.8 95.6696,192.8 96.2594,192.8 C96.4068,192.8 96.5527,192.8 96.6971,192.8 C96.7693,192.8 96.8411,192.8 96.9125,192.8 " fill="none" id=" -to-FE" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="96.9125,192.8,87.9125,188.8,91.9125,192.8,87.9125,196.8,96.9125,192.8" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="s [...]
+link FE to EL--><path d="M105.58,192.8 C115.35,192.8 125.12,192.8 134.89,192.8 " fill="none" id="FE-to-EL" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="139.99,192.8,130.99,188.8,134.99,192.8,130.99,196.8,139.99,192.8" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2c760634608609d01a798da024c32d51]
+link FE to APP--><path d="M119.9947,73.5862 C120.1352,73.44 120.2765,73.2945 120.4187,73.1496 C121.5564,71.9902 122.7494,70.8725 124,69.8 C161.11,37.98 190.83,46.85 234,69.8 C268.01,87.88 290.6,126.79 303.51,156.04 " fill="none" id="FE-APP" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="305.5,160.64,305.5943,150.7916,303.5132,156.0517,298.2531,153.9705,305.5,160.64" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="119.9947,73.5862,129.1 [...]
+link APP to FW--><path d="M312.43,224.81 C307.73,267 304.72,343.64 334,399.8 C346.09,423 366.82,442.59 387.11,457.66 " fill="none" id="APP-to-FW" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="391.16,460.61,386.2376,452.0794,387.1176,457.6674,381.5296,458.5474,391.16,460.61" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="335" y="353.3">uses</text><!--MD5=[83c5898c7 [...]
+link EL to RE--><path d="M183.25,169.65 C191.55,132.62 213.91,62.26 266.5,42.8 C365.98,6 653.5,95.85 814.12,151.91 " fill="none" id="EL-to-RE" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="819.3,153.73,812.1112,146.9979,814.5769,152.0891,809.4857,154.5548,819.3,153.73" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="761.4006" y="143.1621">export</text><!--MD5=[e6ed [...]
+reverse link RE to DRT--><path d="M1453.74,192.8 C1477.47,192.8 1498.72,192.8 1516.47,192.8 " fill="none" id="RE-backto-DRT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1448.63,192.8,1457.63,196.8,1453.63,192.8,1457.63,188.8,1448.63,192.8" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="1467" y="186.8">reads</text><!--MD5=[5ea144c57fb525e20369093d1f53f308]
+link DRT to APP--><path d="M1550.97,152.77 C1532.51,123.76 1503.22,86.75 1466,69.8 C1411.45,44.95 438.82,39.67 387,69.8 C355.48,88.13 336.98,126.55 327,155.6 " fill="none" id="DRT-to-APP" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="325.35,160.54,331.9776,153.2548,326.9226,155.7937,324.3836,150.7387,325.35,160.54" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="92 [...]
+link APP to NREG--><path d="M343.21,225.13 C368.81,255.73 406.98,301.35 428.57,327.16 " fill="none" id="APP-NREG" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[08c403ccfe222087d529d28b9c140709]
+link NREG to FW--><path d="M445,368.38 C445,392.17 445,432.6 445,460.67 " fill="none" id="NREG-FW" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[673e9f9a81f537462409c64e24cb9ee8]
 @startuml
 
 : : -> FE : action
@@ -73,7 +73,7 @@ NREG .. FW
 
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-c35f3de4f309ea9d094fc134d2c5eb95e4443958.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-c35f3de4f309ea9d094fc134d2c5eb95e4443958.svg
index fa7042f..a6c03b2 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-c35f3de4f309ea9d094fc134d2c5eb95e4443958.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-c35f3de4f309ea9d094fc134d2c5eb95e4443958.svg
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="937px" preserveAspectRatio="none" style="width:1248px;height:937px;" version="1.1" viewBox="0 0 1248 937" width="1248px" zoomAndPan="magnify"><defs><filter height="300%" id="f18ez2y4e7d4n7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feCol [...]
-cluster gradle--><rect fill="#FFFFFF" filter="url(#f18ez2y4e7d4n7)" height="196" style="stroke:#000000;stroke-width:1.5;" width="403" x="132" y="267.5"/><rect fill="#FFFFFF" height="10" style="stroke:#000000;stroke-width:1.5;" width="15" x="515" y="272.5"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="513" y="274.5"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="513" y="278.5"/><text fill="#000000" font-famil [...]
-cluster root--><polygon fill="#FFD700" filter="url(#f18ez2y4e7d4n7)" points="792,309,822,309,829,333.8945,1099,333.8945,1099,775.5,792,775.5,792,309" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="792" x2="829" y1="333.8945" y2="333.8945"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="24" x="796" y="325.7383">root</text><!--MD5=[f28f95b14f0c83ad8c9a9e34ae6e57b1]
-cluster NM--><polygon fill="#FFD700" filter="url(#f18ez2y4e7d4n7)" points="91,649.5,217,649.5,224,674.3945,341,674.3945,341,788.5,91,788.5,91,649.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="91" x2="224" y1="674.3945" y2="674.3945"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="120" x="95" y="666.2383">root.node_modules</text><!--MD5=[d3f63dd2493a0d75452850aaedea626f]
-entity KF--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="131" x="379.5" y="371.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="490.5" y="376.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="488.5" y="378.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="488.5" y="382.5"/><text fill="#000000" fon [...]
-entity K2JS--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="67.7891" style="stroke:#A80036;stroke-width:1.5;" width="109" x="250.5" y="371.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="339.5" y="376.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="337.5" y="378.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="337.5" y="382.5"/><text fill="#000000" f [...]
-entity DCE--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="48.8945" style="stroke:#A80036;stroke-width:1.5;" width="66" x="164" y="381"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="210" y="386"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="208" y="388"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="208" y="392"/><text fill="#000000" font-family="sans-s [...]
-entity GCFG--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="76.6836" style="stroke:#000000;stroke-width:1.5;" width="124" x="808" y="367"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="818" y="391.7383">build.gradle</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="90" x="818" y="410.6328">settings.gradle</text><text fill="#000000" font-family="sans-serif" font-size=" [...]
-entity KC--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="38.8945" style="stroke:#000000;stroke-width:1.5;" width="103" x="808.5" y="720.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="818.5" y="745.2383">karma.conf.js</text><!--MD5=[e4aaec21de269c7bd285ce6876c0ce8e]
-entity PJ--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="38.8945" style="stroke:#000000;stroke-width:1.5;" width="103" x="979.5" y="720.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="989.5" y="745.2383">package.json</text><!--MD5=[1589b7aebea7faa6412065a7cb4c3aef]
-entity root.build--><polygon fill="#FFD700" filter="url(#f18ez2y4e7d4n7)" points="188,553,264,553,271,577.8945,288,577.8945,288,594.8945,188,594.8945,188,553" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="188" x2="271" y1="577.8945" y2="577.8945"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="58" x="198" y="570.7383">root.build</text><!--MD5=[7eb69e8c49b0f1a4682e6d31435646e4]
-entity karma--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="48.8945" style="stroke:#A80036;stroke-width:1.5;" width="78" x="123" y="715.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="181" y="720.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="179" y="722.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="179" y="726.5"/><text fill="#000000" font-fami [...]
-entity webpack--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="48.8945" style="stroke:#A80036;stroke-width:1.5;" width="95" x="221.5" y="715.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="296.5" y="720.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="294.5" y="722.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="294.5" y="726.5"/><text fill="#000000" [...]
-entity NodeJS--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="48.8945" style="stroke:#A80036;stroke-width:1.5;" width="88" x="227" y="50.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="295" y="55.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="293" y="57.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="293" y="61.5"/><text fill="#000000" font-family= [...]
-entity Browser--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="48.8945" style="stroke:#A80036;stroke-width:1.5;" width="89" x="117.5" y="874.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="186.5" y="879.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="184.5" y="881.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="184.5" y="885.5"/><text fill="#000000" [...]
-entity DEV--><ellipse cx="174" cy="14" fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M174,22 L174,49 M161,30 L187,30 M174,49 L161,64 M174,49 L187,64 " fill="none" filter="url(#f18ez2y4e7d4n7)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="141" y="84.2383">Developer,</text><text fill="#000000" font-family="sans-serif" font-size= [...]
-entity npm--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="48.8945" style="stroke:#A80036;stroke-width:1.5;" width="67" x="708.5" y="549.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="755.5" y="554.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="753.5" y="556.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="753.5" y="560.5"/><text fill="#000000" fon [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="886px" preserveAspectRatio="none" style="width:1241px;height:886px;" version="1.1" viewBox="0 0 1241 886" width="1241px" zoomAndPan="magnify"><defs><filter height="300%" id="f18ez2y4e7d4n7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feCol [...]
+cluster gradle--><rect fill="#FFFFFF" filter="url(#f18ez2y4e7d4n7)" height="184" style="stroke:#000000;stroke-width:1.5;" width="411" x="126.5" y="252.5"/><rect fill="#FFFFFF" height="10" style="stroke:#000000;stroke-width:1.5;" width="15" x="517.5" y="257.5"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="515.5" y="259.5"/><rect fill="#FFFFFF" height="2" style="stroke:#000000;stroke-width:1.5;" width="4" x="515.5" y="263.5"/><text fill="#000000" fo [...]
+cluster root--><polygon fill="#FFD700" filter="url(#f18ez2y4e7d4n7)" points="788.5,291.5,822.5,291.5,829.5,314.2999,1092.5,314.2999,1092.5,732.5,788.5,732.5,788.5,291.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="788.5" x2="829.5" y1="314.2999" y2="314.2999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="28" x="792.5" y="307.4999">root</text><!--MD5=[f28f95b14f0c83ad8c9a [...]
+cluster NM--><polygon fill="#FFD700" filter="url(#f18ez2y4e7d4n7)" points="87.5,612.5,227.5,612.5,234.5,635.2999,337.5,635.2999,337.5,745.5,87.5,745.5,87.5,612.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="87.5" x2="234.5" y1="635.2999" y2="635.2999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="134" x="91.5" y="628.4999">root.node_modules</text><!--MD5=[d3f63dd2493a0d7 [...]
+entity KF--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="134" x="379.5" y="348.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="493.5" y="353.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="491.5" y="355.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="491.5" y="359.5"/><text fill="#000000" fon [...]
+entity K2JS--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="63.5999" style="stroke:#A80036;stroke-width:1.5;" width="111" x="248" y="348.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="339" y="353.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="337" y="355.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="337" y="359.5"/><text fill="#000000" font-fami [...]
+entity DCE--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="46.7999" style="stroke:#A80036;stroke-width:1.5;" width="69" x="159" y="357"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="208" y="362"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="206" y="364"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="206" y="368"/><text fill="#000000" font-family="sans-s [...]
+entity GCFG--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="70.3998" style="stroke:#000000;stroke-width:1.5;" width="124" x="804.5" y="345.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73" x="814.5" y="369.4999">build.gradle</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="814.5" y="386.2999">settings.gradle</text><text fill="#000000" font-family="sans-serif" fon [...]
+entity KC--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="36.7999" style="stroke:#000000;stroke-width:1.5;" width="103" x="805" y="679.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="815" y="703.4999">karma.conf.js</text><!--MD5=[e4aaec21de269c7bd285ce6876c0ce8e]
+entity PJ--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="36.7999" style="stroke:#000000;stroke-width:1.5;" width="102" x="974.5" y="679.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="984.5" y="703.4999">package.json</text><!--MD5=[1589b7aebea7faa6412065a7cb4c3aef]
+entity root.build--><polygon fill="#FFD700" filter="url(#f18ez2y4e7d4n7)" points="183.5,520,267.5,520,274.5,542.7999,291.5,542.7999,291.5,559.7999,183.5,559.7999,183.5,520" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="183.5" x2="274.5" y1="542.7999" y2="542.7999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="66" x="193.5" y="536.9999">root.build</text><!--MD5=[7eb69e8c49b [...]
+entity karma--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="46.7999" style="stroke:#A80036;stroke-width:1.5;" width="79" x="119" y="674.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="178" y="679.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="176" y="681.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="176" y="685.5"/><text fill="#000000" font-fami [...]
+entity webpack--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="46.7999" style="stroke:#A80036;stroke-width:1.5;" width="95" x="218" y="674.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="293" y="679.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="291" y="681.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="291" y="685.5"/><text fill="#000000" font-fa [...]
+entity NodeJS--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="46.7999" style="stroke:#A80036;stroke-width:1.5;" width="88" x="220.5" y="47"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="288.5" y="52"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="286.5" y="54"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="286.5" y="58"/><text fill="#000000" font-family= [...]
+entity Browser--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="46.7999" style="stroke:#A80036;stroke-width:1.5;" width="90" x="113.5" y="825.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="183.5" y="830.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="181.5" y="832.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="181.5" y="836.5"/><text fill="#000000" [...]
+entity DEV--><ellipse cx="167.5" cy="14" fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M167.5,22 L167.5,49 M154.5,30 L180.5,30 M167.5,49 L154.5,64 M167.5,49 L180.5,64 " fill="none" filter="url(#f18ez2y4e7d4n7)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="65" x="135" y="83.4999">Developer,</text><text fill="#000000" font-family="sans [...]
+entity npm--><rect fill="#FEFECE" filter="url(#f18ez2y4e7d4n7)" height="46.7999" style="stroke:#A80036;stroke-width:1.5;" width="67" x="705" y="516.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="752" y="521.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="750" y="523.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="750" y="527.5"/><text fill="#000000" font-family [...]
 link GCFG to PJ--><!--MD5=[c657d0b6483e9c774ed213975b370d94]
-link gradle to GCFG--><path d="M131.9712,377.1238 C131.927,376.9299 131.8829,376.7353 131.8388,376.5399 C131.6623,375.7586 131.4866,374.9658 131.312,374.162 C130.6137,370.9468 129.9335,367.5562 129.2987,364.0256 C128.0291,356.9644 126.9409,349.3431 126.2513,341.445 C123.4925,309.8525 127.11,273.83 151,251.5 C235.99,172.06 558.17,249.72 674.5,249.5 C701.61,249.45 710.85,238.21 735.5,249.5 C785.8,272.54 824.42,324.71 847.12,362.38 " fill="none" id="gradle-to-GCFG" style="stroke:#A80036;str [...]
-link gradle to webpack--><path d="M148.2041,463.6774 C148.2466,463.9325 148.2892,464.1876 148.3319,464.4426 C148.5027,465.4626 148.6751,466.4817 148.849,467.4984 C149.5445,471.5653 150.2638,475.595 151,479.5 C161.05,532.79 144.02,556.23 178,598.5 C183.23,605.01 188.82,600.88 195,606.5 C205.32,615.88 204.08,621.39 211,633.5 C225.9,659.6 242.36,689.66 253.92,711 " fill="none" id="gradle-to-webpack" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="256.32,715.41,255. [...]
-link K2JS to root.build--><path d="M279.03,439.68 C267.81,452.9 254.05,467.73 240,479.5 C234.8,483.86 230.31,481.58 227,487.5 C216.72,505.89 221.07,529.91 227.07,547.8 " fill="none" id="K2JS-to-root.build" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="228.8,552.68,229.5626,542.8607,227.1292,547.9674,222.0225,545.534,228.8,552.68" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLe [...]
-link KF to KC--><path d="M410.68,439.56 C385.41,466.45 353.1,506.8 339,549.5 C332.17,570.18 325.76,581.21 339,598.5 C395.82,672.68 680.45,716.56 803.34,732.33 " fill="none" id="KF-to-KC" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="808.36,732.97,799.9347,727.8696,803.3997,732.341,798.9283,735.8061,808.36,732.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="99" x="340" [...]
-link KC to PJ--><path d="M911.77,740 C931.52,740 954.14,740 974.33,740 " fill="none" id="KC-to-PJ" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="979.41,740,970.41,736,974.41,740,970.41,744,979.41,740" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="922.5" y="732.6855">requires</text><!--MD5=[c6bfe5db0d9522034a77668c71e39324]
-link PJ to NM--><path d="M1018.35,720.45 C1000.47,694.82 965.12,651.07 922,633.5 C880.22,616.48 143.5,603.28 110,633.5 C105.79,637.2975 102.427,641.7019 99.769,646.5146 C99.4368,647.1162 99.1155,647.7242 98.805,648.3381 C98.6498,648.6451 98.4972,648.9536 98.3473,649.2635 " fill="none" id="PJ-to-NM" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="98.3473,649.2635,105.8671,642.9033,100.5245,644.7624,98.6654,639.4198,98.3473,649.2635" style="stroke:#A80036;stroke-w [...]
-link DEV to RUN--><path d="M174,145.61 C174,149.74 174,153.69 174,157.35 " fill="none" id="DEV-to-RUN" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="174,162.48,178,153.48,174,157.48,170,153.48,174,162.48" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f3b0fd7d4b151759cb13e321df9d8a78]
-link DEV to NI--><path d="M207.01,136 C210.12,139.45 213.45,142.66 217,145.5 C231.09,156.77 512.86,237.31 524,251.5 C592.87,339.2 572.83,484.71 560.46,545.25 " fill="none" id="DEV-to-NI" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="559.44,550.15,565.1813,542.1476,560.4535,545.2538,557.3473,540.526,559.44,550.15" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b17037f98e12b29962cd7c1ac441a1f1]
-link RUN to gradle--><path d="M167.13,198.45 C161.78,212.43 154.66,232.93 151,251.5 C150.1888,255.615 149.4357,259.8028 148.7368,264.0388 C148.562,265.0978 148.3907,266.1598 148.2226,267.2245 " fill="none" id="RUN-to-gradle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="148.2226,267.2245,153.5768,258.9581,149.0021,262.2856,145.6747,257.7109,148.2226,267.2245" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ab89fc97919d97f1f5f6fb1ea42f9f2d]
-link NI to npm--><path d="M658.72,574 C674.5,574 689.87,574 703.02,574 " fill="none" id="NI-to-npm" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="708.14,574,699.14,570,703.14,574,699.14,578,708.14,574" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="669.5" y="566.6855">uses</text><!--MD5=[f85af7db3b42217e115ddf1011bcd57f]
-link NI to PJ--><path d="M636.8,588.49 C657.14,591.79 678.85,595.29 699,598.5 C723.77,602.45 899.55,622.31 922,633.5 C960.99,652.93 995.11,691.31 1014.37,716.03 " fill="none" id="NI-to-PJ" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1017.56,720.17,1015.2231,710.6024,1014.5032,716.2133,1008.8923,715.4933,1017.56,720.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" [...]
-link DEV to TEST--><path d="M140.6,99.15 C121.23,114.63 98.46,136.83 87,162.5 C25.77,299.73 51.06,488.95 61.97,551.78 " fill="none" id="DEV-to-TEST" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="62.85,556.77,65.2441,547.2166,61.9909,551.8444,57.3631,548.5912,62.85,556.77" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f1ad7c348f545d25b38a2b6484a9d476]
-link TEST to npm--><path d="M103.78,560.73 C148.18,545.91 224.37,522.82 292,514 C346.08,506.94 402.02,491.79 669,549.5 C680.33,551.95 692.36,555.55 703.32,559.24 " fill="none" id="TEST-to-npm" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="708.27,560.94,701.0631,554.2273,703.5425,559.3118,698.458,561.7912,708.27,560.94" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="s [...]
-link TEST to karma--><path d="M61.45,591.02 C59.37,602.02 58.91,616.26 67,625.5 C82.4,643.1 100.65,619.01 119,633.5 C142.63,652.15 153.36,685.91 158.18,710.22 " fill="none" id="TEST-to-karma" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="159.12,715.26,161.4063,705.6802,158.2055,710.3443,153.5413,707.1435,159.12,715.26" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="25" x [...]
-link karma to Browser--><path d="M162,764.5 C162,792.48 162,839.19 162,869.29 " fill="none" id="karma-to-Browser" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="162,874.33,166,865.33,162,869.33,158,865.33,162,874.33" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="179" y="827.1855">displays</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdj [...]
+link gradle to GCFG--><path d="M126.4079,350.595 C126.3682,350.4057 126.3286,350.2157 126.2891,350.0251 C126.2101,349.6439 126.1314,349.2602 126.0531,348.874 C125.8965,348.1017 125.7414,347.3197 125.5882,346.5285 C125.2818,344.946 124.9831,343.3267 124.695,341.6747 C123.5429,335.0666 122.5628,327.9353 121.9563,320.5463 C119.53,290.99 123.08,257.31 145.5,236.5 C231.66,156.52 556.94,235.61 674.5,235.5 C702.06,235.47 711.34,224.27 736.5,235.5 C784.36,256.87 821.93,305.54 844.12,340.6 " fill [...]
+link gradle to webpack--><path d="M142.5448,436.761 C142.5665,436.885 142.5882,437.009 142.6099,437.1329 C142.6533,437.3808 142.6969,437.6287 142.7406,437.8765 C142.9153,438.8677 143.092,439.8578 143.2707,440.8456 C143.9852,444.7967 144.73,448.71 145.5,452.5 C155.63,502.36 142.73,522.98 173.5,563.5 C177.83,569.21 182,566.91 187.5,571.5 C198.64,580.8 200.22,584.58 208.5,596.5 C224.99,620.24 240.98,649.09 251.8,669.79 " fill="none" id="gradle-to-webpack" style="stroke:#A80036;stroke-width: [...]
+link K2JS to root.build--><path d="M275.64,412.53 C264.25,425.06 250.86,439.58 238.5,452.5 C235.02,456.13 232.42,455.85 230.5,460.5 C223.4,477.65 225.79,498.67 229.61,514.64 " fill="none" id="K2JS-to-root.build" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="230.94,519.85,232.5772,510.1382,229.6971,515.0069,224.8283,512.1268,230.94,519.85" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacin [...]
+link KF to KC--><path d="M412.28,412.66 C387.3,437.88 355.47,475.78 341.5,516.5 C334.72,536.26 328.72,546.98 341.5,563.5 C397.74,636.18 677.72,676.53 799.62,690.9 " fill="none" id="KF-to-KC" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="804.6,691.48,796.1298,686.4544,799.6343,690.895,795.1938,694.3995,804.6,691.48" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="98" x="34 [...]
+link KC to PJ--><path d="M908.12,698 C927.46,698 949.52,698 969.25,698 " fill="none" id="KC-to-PJ" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="974.48,698,965.48,694,969.48,698,965.48,702,974.48,698" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="45" x="918.75" y="692">requires</text><!--MD5=[c6bfe5db0d9522034a77668c71e39324]
+link PJ to NM--><path d="M1012.6,679.11 C994.74,654.85 959.97,613.92 918.5,597.5 C876.56,580.89 140.09,567.39 106.5,597.5 C102.5138,601.0738 99.3212,605.2225 96.7899,609.7585 C96.4735,610.3255 96.1674,610.8986 95.8714,611.4773 C95.7234,611.7667 95.5779,612.0575 95.4349,612.3496 " fill="none" id="PJ-to-NM" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="95.4349,612.3496,102.9843,606.0245,97.633,607.8587,95.7988,602.5075,95.4349,612.3496" style="stroke:#A80036;str [...]
+link DEV to RUN--><path d="M167.5,136.59 C167.5,140.68 167.5,144.6 167.5,148.22 " fill="none" id="DEV-to-RUN" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="167.5,153.28,171.5,144.28,167.5,148.28,163.5,144.28,167.5,153.28" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f3b0fd7d4b151759cb13e321df9d8a78]
+link DEV to NI--><path d="M200.14,127.11 C203.37,130.55 206.83,133.73 210.5,136.5 C239.9,158.68 503.39,207.82 526.5,236.5 C592.03,317.82 572.94,454.33 560.93,512 " fill="none" id="DEV-to-NI" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="559.86,517,565.6506,509.0333,560.9037,512.1102,557.8269,507.3633,559.86,517" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b17037f98e12b29962cd7c1ac441a1f1]
+link RUN to gradle--><path d="M160.84,187.48 C155.74,200.46 149.01,219.34 145.5,236.5 C144.715,240.3425 143.985,244.2535 143.3061,248.21 C143.1364,249.1991 142.9699,250.191 142.8065,251.1855 C142.7656,251.4341 142.725,251.6829 142.6845,251.9318 " fill="none" id="RUN-to-gradle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="142.6845,251.9318,148.0765,243.69,143.4866,246.9965,140.1801,242.4067,142.6845,251.9318" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ [...]
+link NI to npm--><path d="M657.53,540 C672.47,540 687.02,540 699.57,540 " fill="none" id="NI-to-npm" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="704.83,540,695.83,536,699.83,540,695.83,544,704.83,540" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="668.25" y="534">uses</text><!--MD5=[f85af7db3b42217e115ddf1011bcd57f]
+link NI to PJ--><path d="M636.12,554.19 C655.57,557.28 676.27,560.54 695.5,563.5 C720.26,567.31 895.95,585.59 918.5,596.5 C956.67,614.96 990.42,651.88 1009.37,675.46 " fill="none" id="NI-to-PJ" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1012.51,679.41,1010.0581,669.8712,1009.4058,675.4904,1003.7866,674.838,1012.51,679.41" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength= [...]
+link DEV to TEST--><path d="M134.82,94.52 C116.86,109.16 96.12,129.8 85.5,153.5 C27.62,282.7 50.26,461.08 59.97,519.57 " fill="none" id="DEV-to-TEST" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="60.86,524.86,63.2857,515.3145,60.0172,519.9315,55.4001,516.6631,60.86,524.86" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f1ad7c348f545d25b38a2b6484a9d476]
+link TEST to npm--><path d="M100.46,528.32 C145.5,514.74 224.18,493.17 293.5,485 C459.16,465.47 504.19,482.51 667.5,516.5 C678.3,518.75 689.76,522.09 700.24,525.56 " fill="none" id="TEST-to-npm" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="704.98,527.16,697.7128,520.5126,700.238,525.5746,695.1761,528.0998,704.98,527.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust= [...]
+link TEST to karma--><path d="M59.42,555.18 C57.35,565.64 56.68,579.56 64.5,588.5 C79.6,605.78 97.39,582.41 115.5,596.5 C138.2,614.16 149.09,646.13 154.2,669.27 " fill="none" id="TEST-to-karma" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="155.27,674.37,157.3358,664.7402,154.2428,669.4766,149.5064,666.3837,155.27,674.37" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" [...]
+link karma to Browser--><path d="M158.5,721.63 C158.5,747.99 158.5,791.56 158.5,820.03 " fill="none" id="karma-to-Browser" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="158.5,825.16,162.5,816.16,158.5,820.16,154.5,816.16,158.5,825.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="45" x="173" y="783.5">displays</text><text fill="#000000" font-family="sans-serif" font-siz [...]
 @startuml
 skinparam nodesep 20
 skinparam ranksep 5
@@ -93,7 +93,7 @@ end note
 
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-e9e9c75cab2e20cf819e422eeb7ba10104e25602.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-e9e9c75cab2e20cf819e422eeb7ba10104e25602.svg
index 132cec3..66713fc 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-e9e9c75cab2e20cf819e422eeb7ba10104e25602.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-e9e9c75cab2e20cf819e422eeb7ba10104e25602.svg
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1389px" preserveAspectRatio="none" style="width:1122px;height:1389px;" version="1.1" viewBox="0 0 1122 1389" width="1122px" zoomAndPan="magnify"><defs><filter height="300%" id="f18wh9ue8dxqp9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><fe [...]
-cluster remote--><polygon fill="#FFFFFF" filter="url(#f18wh9ue8dxqp9)" points="840,126,850,116,1105,116,1105,399.5,1095,409.5,840,409.5,840,126" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1095" x2="1105" y1="126" y2="116"/><line style="stroke:#000000;stroke-width:1.5;" x1="840" x2="1095" y1="126" y2="126"/><line style="stroke:#000000;stroke-width:1.5;" x1="1095" x2="1095" y1="126" y2="409.5"/><text fill="#000000" font-family="sans-serif"  [...]
-cluster to--><polygon fill="#FFFFFF" filter="url(#f18wh9ue8dxqp9)" points="16,827.5,34,827.5,41,852.3945,493,852.3945,493,1382.5,16,1382.5,16,827.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="41" y1="852.3945" y2="852.3945"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="12" x="20" y="844.2383">to</text><!--MD5=[ccc460d39f96760bc67bdadf7a404591]
-cluster to.layout--><polygon fill="#FFFFFF" filter="url(#f18wh9ue8dxqp9)" points="556,1149.5,615,1149.5,622,1174.3945,654,1174.3945,654,1271.5,556,1271.5,556,1149.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="556" x2="622" y1="1174.3945" y2="1174.3945"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="53" x="560" y="1166.2383">to.layout</text><!--MD5=[5f5aa3eac08eb7d12d88ff [...]
-class RestfulObjects--><rect codeLine="42" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="RestfulObjects" style="stroke:#A80036;stroke-width:1.5;" width="107" x="856.5" y="184"/><ellipse cx="871.5" cy="200" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M874.1563,206.2031 L868.0313,206.2031 L868.0313,204.3125 L870.0313,204.3125 L870.0313,194.9844 L868.0313,194.9844 L868.0313,193.0938 L874.1563,193.0938 L874.1563,194.9844 L872.1563,194.9844 [...]
-class ApacheIsis--><rect codeLine="43" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="58.3906" id="ApacheIsis" style="stroke:#A80036;stroke-width:1.5;" width="94" x="856" y="335.5"/><ellipse cx="871" cy="356.6953" fill="#FF7700" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M871.0469,350.8672 L871.0781,350.8672 L870.0625,356.9453 L872.0625,356.9453 L871.0469,350.8672 Z M872.4688,358.8203 L869.6563,358.8203 L868.8594,362.3984 L866.7344,362.3984 L869.9844,349.289 [...]
-class NakedObjects--><rect codeLine="44" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="58.3906" id="NakedObjects" style="stroke:#A80036;stroke-width:1.5;" width="103" x="985.5" y="335.5"/><ellipse cx="1000.5" cy="356.6953" fill="#FF7700" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1000.5469,350.8672 L1000.5781,350.8672 L999.5625,356.9453 L1001.5625,356.9453 L1000.5469,350.8672 Z M1001.9688,358.8203 L999.1563,358.8203 L998.3594,362.3984 L996.2344,362.3984 L9 [...]
-class to.Link--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Link" style="stroke:#A80036;stroke-width:1.5;" width="53" x="407.5" y="1032"/><ellipse cx="422.5" cy="1048" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M418.4375,1048.1406 Q418.4375,1044.6875 419.5313,1043.0625 Q420.6406,1041.4219 422.8594,1041.4219 Q424.0625,1041.4219 425.3281,1042.0781 L425.3281,1044.125 Q423.875,1043.3438 422.9375,1043.3438 Q420.4844,1043.3438 42 [...]
-class to.Extensions--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Extensions" style="stroke:#A80036;stroke-width:1.5;" width="87" x="389.5" y="1207.5"/><ellipse cx="404.5" cy="1223.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M400.4375,1223.6406 Q400.4375,1220.1875 401.5313,1218.5625 Q402.6406,1216.9219 404.8594,1216.9219 Q406.0625,1216.9219 407.3281,1217.5781 L407.3281,1219.625 Q405.875,1218.8438 404.9375,1218.8438 Q402.4 [...]
-class to.Linked--><rect codeLine="56" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="62.8457" id="to.Linked" style="stroke:#A80036;stroke-width:1.5;" width="66" x="278" y="885.5"/><ellipse cx="293.45" cy="901.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M296.1063,907.7031 L289.9813,907.7031 L289.9813,905.8125 L291.9813,905.8125 L291.9813,896.4844 L289.9813,896.4844 L289.9813,894.5938 L296.1063,894.5938 L296.1063,896.4844 L294.1063,896.4844 L2 [...]
-class to.Result--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Result" style="stroke:#A80036;stroke-width:1.5;" width="64" x="32" y="1032"/><ellipse cx="47" cy="1048" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M42.9375,1048.1406 Q42.9375,1044.6875 44.0313,1043.0625 Q45.1406,1041.4219 47.3594,1041.4219 Q48.5625,1041.4219 49.8281,1042.0781 L49.8281,1044.125 Q48.375,1043.3438 47.4375,1043.3438 Q44.9844,1043.3438 44.9844,1048.14 [...]
-class to.ResultList--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.ResultList" style="stroke:#A80036;stroke-width:1.5;" width="83" x="131.5" y="1032"/><ellipse cx="146.5" cy="1048" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M142.4375,1048.1406 Q142.4375,1044.6875 143.5313,1043.0625 Q144.6406,1041.4219 146.8594,1041.4219 Q148.0625,1041.4219 149.3281,1042.0781 L149.3281,1044.125 Q147.875,1043.3438 146.9375,1043.3438 Q144.4844, [...]
-class to.Extended--><rect codeLine="64" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="62.8457" id="to.Extended" style="stroke:#A80036;stroke-width:1.5;" width="123" x="249.5" y="1024.5"/><ellipse cx="284.75" cy="1040.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M287.4063,1046.7031 L281.2813,1046.7031 L281.2813,1044.8125 L283.2813,1044.8125 L283.2813,1035.4844 L281.2813,1035.4844 L281.2813,1033.5938 L287.4063,1033.5938 L287.4063,1035.4844 L28 [...]
-class to.Property--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Property" style="stroke:#A80036;stroke-width:1.5;" width="74" x="32" y="1207.5"/><ellipse cx="47" cy="1223.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M42.9375,1223.6406 Q42.9375,1220.1875 44.0313,1218.5625 Q45.1406,1216.9219 47.3594,1216.9219 Q48.5625,1216.9219 49.8281,1217.5781 L49.8281,1219.625 Q48.375,1218.8438 47.4375,1218.8438 Q44.9844,1218.8438 44.9844 [...]
-class to.TObject--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.TObject" style="stroke:#A80036;stroke-width:1.5;" width="71" x="141.5" y="1207.5"/><ellipse cx="156.5" cy="1223.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M152.4375,1223.6406 Q152.4375,1220.1875 153.5313,1218.5625 Q154.6406,1216.9219 156.8594,1216.9219 Q158.0625,1216.9219 159.3281,1217.5781 L159.3281,1219.625 Q157.875,1218.8438 156.9375,1218.8438 Q154.4844,12 [...]
-class to.Service--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Service" style="stroke:#A80036;stroke-width:1.5;" width="69" x="247.5" y="1207.5"/><ellipse cx="262.5" cy="1223.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M258.4375,1223.6406 Q258.4375,1220.1875 259.5313,1218.5625 Q260.6406,1216.9219 262.8594,1216.9219 Q264.0625,1216.9219 265.3281,1217.5781 L265.3281,1219.625 Q263.875,1218.8438 262.9375,1218.8438 Q260.4844,12 [...]
-class to.Member--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Member" style="stroke:#A80036;stroke-width:1.5;" width="74" x="281" y="1318.5"/><ellipse cx="296" cy="1334.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M291.9375,1334.6406 Q291.9375,1331.1875 293.0313,1329.5625 Q294.1406,1327.9219 296.3594,1327.9219 Q297.5625,1327.9219 298.8281,1328.5781 L298.8281,1330.625 Q297.375,1329.8438 296.4375,1329.8438 Q293.9844,1329.843 [...]
-class to.layout.Layout--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.layout.Layout" style="stroke:#A80036;stroke-width:1.5;" width="65" x="572.5" y="1207.5"/><ellipse cx="587.5" cy="1223.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M583.4375,1223.6406 Q583.4375,1220.1875 584.5313,1218.5625 Q585.6406,1216.9219 587.8594,1216.9219 Q589.0625,1216.9219 590.3281,1217.5781 L590.3281,1219.625 Q588.875,1218.8438 587.9375,1218.8438  [...]
-class XHR--><rect codeLine="2" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="62.8457" id="XHR" style="stroke:#A80036;stroke-width:1.5;" width="53" x="540.5" y="176.5"/><ellipse cx="555.5" cy="192.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M551.4375,192.6406 Q551.4375,189.1875 552.5313,187.5625 Q553.6406,185.9219 555.8594,185.9219 Q557.0625,185.9219 558.3281,186.5781 L558.3281,188.625 Q556.875,187.8438 555.9375,187.8438 Q553.4844,187.8438 5 [...]
-class EventStore--><rect codeLine="6" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="132.6191" id="EventStore" style="stroke:#A80036;stroke-width:1.5;" width="87" x="628.5" y="141.5"/><ellipse cx="643.5" cy="162.6953" fill="#FF7700" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M643.7656,158.0391 Q643.1094,158.0391 642.6875,158.4609 Q642.2813,158.8672 642.2813,159.5234 Q642.2813,160.2578 642.5938,160.7422 Q642.9063,161.2109 643.6563,161.5547 Q645.625,162.4297 6 [...]
-class LogEntry--><rect codeLine="14" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="181.6113" id="LogEntry" style="stroke:#A80036;stroke-width:1.5;" width="123" x="599.5" y="474.5"/><ellipse cx="635.65" cy="490.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M631.5875,490.6406 Q631.5875,487.1875 632.6813,485.5625 Q633.7906,483.9219 636.0094,483.9219 Q637.2125,483.9219 638.4781,484.5781 L638.4781,486.625 Q637.025,485.8438 636.0875,485.8438 Q633.6 [...]
-class TransferObject--><rect codeLine="52" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="TransferObject" style="stroke:#A80036;stroke-width:1.5;" width="107" x="448.5" y="725"/><ellipse cx="463.5" cy="741" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M466.1563,747.2031 L460.0313,747.2031 L460.0313,745.3125 L462.0313,745.3125 L462.0313,735.9844 L460.0313,735.9844 L460.0313,734.0938 L466.1563,734.0938 L466.1563,735.9844 L464.1563,735.9844 [...]
-class Aggregator--><rect codeLine="75" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="62.8457" id="Aggregator" style="stroke:#A80036;stroke-width:1.5;" width="92" x="740" y="717.5"/><ellipse cx="757.25" cy="733.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M759.9063,739.7031 L753.7813,739.7031 L753.7813,737.8125 L755.7813,737.8125 L755.7813,728.4844 L753.7813,728.4844 L753.7813,726.5938 L759.9063,726.5938 L759.9063,728.4844 L757.9063,728.4844  [...]
-class ResponseHandler--><rect codeLine="29" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="117.7734" id="ResponseHandler" style="stroke:#A80036;stroke-width:1.5;" width="188" x="279" y="149"/><ellipse cx="294" cy="170.1953" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M289.9375,170.3359 Q289.9375,166.8828 291.0313,165.2578 Q292.1406,163.6172 294.3594,163.6172 Q295.5625,163.6172 296.8281,164.2734 L296.8281,166.3203 Q295.375,165.5391 294.4375,165. [...]
-class ListAggregator--><rect codeLine="78" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="62.8457" id="ListAggregator" style="stroke:#A80036;stroke-width:1.5;" width="106" x="642" y="885.5"/><ellipse cx="657" cy="901.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M652.9375,901.6406 Q652.9375,898.1875 654.0313,896.5625 Q655.1406,894.9219 657.3594,894.9219 Q658.5625,894.9219 659.8281,895.5781 L659.8281,897.625 Q658.375,896.8438 657.4375,896.8438  [...]
-class ObjectList--><rect codeLine="87" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="92.5371" id="ObjectList" style="stroke:#A80036;stroke-width:1.5;" width="113" x="638.5" y="1009.5"/><ellipse cx="666.55" cy="1025.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M662.4875,1025.6406 Q662.4875,1022.1875 663.5813,1020.5625 Q664.6906,1018.9219 666.9094,1018.9219 Q668.1125,1018.9219 669.3781,1019.5781 L669.3781,1021.625 Q667.925,1020.8438 666.9875,1 [...]
-class NavigationAggregator--><rect codeLine="84" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="NavigationAggregator" style="stroke:#A80036;stroke-width:1.5;" width="140" x="783" y="893"/><ellipse cx="798" cy="909" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M793.9375,909.1406 Q793.9375,905.6875 795.0313,904.0625 Q796.1406,902.4219 798.3594,902.4219 Q799.5625,902.4219 800.8281,903.0781 L800.8281,905.125 Q799.375,904.3438 798.4375,904.34 [...]
-reverse link EventStore to LogEntry--><path codeLine="25" d="M629.96,287.05 C623.35,302.69 617.54,319.3 614,335.5 C604.02,381.2 612.55,432.16 624.95,474.39 " fill="none" id="EventStore-backto-LogEntry" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="635.4,274.75,629.3148,278.6192,630.5459,285.7244,636.6311,281.8552,635.4,274.75" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c66ef044075bfa520abea1b298c82d62]
-reverse link LogEntry to TransferObject--><path codeLine="26" d="M590.6,646.86 C565.82,675.15 539.84,704.8 522.47,724.63 " fill="none" id="LogEntry-backto-TransferObject" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="599.3,636.93,592.3377,638.8078,591.3933,645.9568,598.3556,644.079,599.3,636.93" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1323f1ce2513c9cf1e00c7aff6d8ac1a]
-reverse link LogEntry to Aggregator--><path codeLine="27" d="M730.04,666.74 C742.65,685.05 754.9,702.84 764.71,717.09 " fill="none" id="LogEntry-backto-Aggregator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="722.58,655.92,722.6855,663.1303,729.3817,665.8062,729.2762,658.5959,722.58,655.92" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c99a35cbbebd0771999276ef9d68dcaa]
-link ResponseHandler to XHR--><path codeLine="35" d="M467.16,208 C491.69,208 516.46,208 535.2,208 " fill="none" id="ResponseHandler-to-XHR" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="540.32,208,531.32,204,535.32,208,531.32,212,540.32,208" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="484.25,195.7725,493.2951,198.7114,493.2951,192.8335,484.25,195.7725" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="san [...]
-link ResponseHandler to TransferObject--><path codeLine="36" d="M371.55,267.2 C371.38,354.96 378.95,524.9 433,656.5 C442.91,680.63 460.76,704.03 475.82,721.14 " fill="none" id="ResponseHandler-to-TransferObject" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="479.19,724.91,476.1981,715.5266,475.8673,721.1737,470.2201,720.8429,479.19,724.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size= [...]
-link XHR to EventStore--><path codeLine="38" d="M593.66,208 C603.48,208 613.29,208 623.11,208 " fill="none" id="XHR-to-EventStore" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="628.24,208,619.24,204,623.24,208,619.24,212,628.24,208" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1b036d3bee70abab8c1eec6380d9d2d0]
-reverse link RestfulObjects to ApacheIsis--><path codeLine="46" d="M908.05,252.15 C906.84,278.81 905.32,312.25 904.27,335.49 " fill="none" id="RestfulObjects-backto-ApacheIsis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="901.05,251.79,908.95,232.13,915.04,252.43,901.05,251.79" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ff455b0d12e54cd289f5a016df291ab1]
-reverse link RestfulObjects to NakedObjects--><path codeLine="47" d="M941.92,247.83 C964.35,275.12 993.83,310.98 1013.98,335.49 " fill="none" id="RestfulObjects-backto-NakedObjects" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="936.31,252.03,929.01,232.13,947.12,243.14,936.31,252.03" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1cde971cbfc4340e811b59a359229905]
-link XHR to RestfulObjects--><path codeLine="48" d="M571.73,176.5 C577.03,153.3 588.1,123.24 611,108 C666.32,71.18 694.05,105.15 760.5,106 C795.4,106.44 808.2,91.59 839,108 C867.36,123.11 886.96,155.16 898.27,178.93 " fill="none" id="XHR-to-RestfulObjects" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="900.42,183.57,900.2489,173.7226,898.3103,179.0369,892.996,177.0982,900.42,183.57" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="san [...]
-reverse link XHR to RestfulObjects--><path codeLine="49" d="M572.94,171.51 C578.64,149.14 589.71,122.17 611,108 C666.32,71.18 694.05,105.15 760.5,106 C795.4,106.44 808.2,91.59 839,108 C869.26,124.12 889.54,159.51 900.42,183.57 " fill="none" id="XHR-backto-RestfulObjects" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="571.73,176.5,577.7234,168.6847,572.899,171.6386,569.9451,166.8142,571.73,176.5" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" fon [...]
-reverse link TransferObject to to.Link--><path codeLine="53" d="M492,792.98 C490.65,798.86 489.28,804.83 488,810.5 C469.64,891.7 448.53,988.23 439.06,1031.72 " fill="none" id="TransferObject-backto-to.Link" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="485.23,791.17,496.56,773.26,498.87,794.32,485.23,791.17" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b54b6402f2c0aeee3f02bd164175ae12]
-reverse link TransferObject to to.Extensions--><path codeLine="54" d="M503.09,793.07 C503.88,860.06 501.86,992.92 478,1102.5 C469.78,1140.25 453.63,1182.16 443.07,1207.41 " fill="none" id="TransferObject-backto-to.Extensions" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="496.09,793.12,502.74,773.01,510.08,792.88,496.09,793.12" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b581451216a7d46b23357fd86de0a340]
-reverse link TransferObject to to.layout.Layout--><path codeLine="55" d="M522.06,791.45 C524.65,797.74 527.06,804.23 529,810.5 C574.46,957.77 596.22,1142.99 602.78,1207.27 " fill="none" id="TransferObject-backto-to.layout.Layout" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="515.61,794.17,513.86,773.05,528.4,788.47,515.61,794.17" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0292e4433c127d38dd87063e03d1827b]
-reverse link TransferObject to to.Linked--><path codeLine="59" d="M446.97,784.25 C435.08,792.39 422.84,801.38 412,810.5 C384.64,833.52 356.78,863.19 337.27,885.19 " fill="none" id="TransferObject-backto-to.Linked" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="443.39,778.23,463.92,773.01,451.12,789.89,443.39,778.23" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[da56766a10462bcc890735f4ba220c5c]
-reverse link to.Linked to to.Result--><path codeLine="60" d="M258.98,937.11 C217.89,953.37 160.02,978.92 114,1009.5 C104.42,1015.87 94.85,1024.03 86.68,1031.67 " fill="none" id="to.Linked-backto-to.Result" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="256.5,930.56,277.67,929.89,261.54,943.63,256.5,930.56" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[609a7d2eede23fcf68d875f7da410297]
-reverse link to.Linked to to.ResultList--><path codeLine="61" d="M265.58,963.09 C242.51,985.99 215.46,1012.85 196.57,1031.6 " fill="none" id="to.Linked-backto-to.ResultList" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="260.9,957.87,280.03,948.75,270.77,967.8,260.9,957.87" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2344372b37003ed52512b79ad8325196]
-reverse link to.Linked to to.Extended--><path codeLine="62" d="M311,969.01 C311,987.62 311,1008.07 311,1024.36 " fill="none" id="to.Linked-backto-to.Extended" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="304,968.75,311,948.75,318,968.75,304,968.75" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[003c6c4f33e5a65c22164ded883e5d46]
-reverse link to.Linked to to.Link--><path codeLine="67" d="M347.43,958.57 C368.79,982.37 395.04,1011.6 412.99,1031.6 " fill="none" id="to.Linked-backto-to.Link" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="338.6,948.75,339.633,955.8867,346.6181,957.678,345.5851,950.5413,338.6,948.75" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3bc29dac53101b63679b8c6ff6e02894]
-reverse link to.Extended to to.Extensions--><path codeLine="68" d="M340.28,1098.64 C364.25,1132.73 397.27,1179.69 416.75,1207.39 " fill="none" id="to.Extended-backto-to.Extensions" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="332.53,1087.62,332.7081,1094.8289,339.431,1097.4371,339.2529,1090.2282,332.53,1087.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cb8c64333b052217f1b563adf04eefcf]
-reverse link to.Extended to to.Property--><path codeLine="69" d="M242.77,1097.27 C239.16,1099.1 235.55,1100.85 232,1102.5 C185.71,1123.99 163.62,1109.33 124,1141.5 C102.42,1159.02 86.99,1187.38 78.07,1207.38 " fill="none" id="to.Extended-backto-to.Property" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="239.76,1090.94,260.7,1087.72,246.34,1103.3,239.76,1090.94" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1a07ac71847d082ca2d8e7391285ac3d]
-reverse link to.Extended to to.TObject--><path codeLine="70" d="M264.4,1101.83 C252.58,1114.19 240.33,1127.94 230,1141.5 C213.99,1162.53 198.89,1188.76 188.93,1207.28 " fill="none" id="to.Extended-backto-to.TObject" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="259.41,1096.91,278.43,1087.56,269.4,1106.73,259.41,1096.91" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[09c2f7ddeb4aba1e4193c5b221896601]
-reverse link to.Extended to to.Service--><path codeLine="71" d="M302.51,1107.8 C297,1140.75 290.09,1182.1 285.86,1207.39 " fill="none" id="to.Extended-backto-to.Service" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="295.68,1106.19,305.88,1087.62,309.49,1108.5,295.68,1106.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f58379db15f2c16fbc74c274baa5ffca]
-reverse link to.Extended to to.Member--><path codeLine="72" d="M327.08,1107.46 C329.95,1118.56 332.51,1130.34 334,1141.5 C342.13,1202.29 341.72,1218.66 334,1279.5 C332.35,1292.51 328.82,1306.7 325.5,1318.22 " fill="none" id="to.Extended-backto-to.Member" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="320.25,1109.05,321.53,1087.89,333.72,1105.23,320.25,1109.05" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d5af093094f02e9038ff511b3336013b]
-reverse link to.Service to to.Member--><path codeLine="73" d="M293.78,1268.16 C299.23,1284.68 305.56,1303.83 310.38,1318.42 " fill="none" id="to.Service-backto-to.Member" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="289.63,1255.62,287.7181,1262.573,293.401,1267.0121,295.3129,1260.059,289.63,1255.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b4780f69cd9b953410ea31178db59d43]
-reverse link ListAggregator to ObjectList--><path codeLine="81" d="M695,962 C695,977.1 695,994.03 695,1009.27 " fill="none" id="ListAggregator-backto-ObjectList" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="695,948.75,691,954.75,695,960.75,699,954.75,695,948.75" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[126f787ca14dc3fd6cd015a28b3d8c4c]
-reverse link Aggregator to ListAggregator--><path codeLine="82" d="M759.36,798.6 C743.99,826.63 725.13,861.03 711.81,885.33 " fill="none" id="Aggregator-backto-ListAggregator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="753.34,795.01,769.1,780.83,765.62,801.74,753.34,795.01" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b4aab1c3b82142bf25eafd68b215e7d9]
-reverse link Aggregator to NavigationAggregator--><path codeLine="85" d="M805.93,799.39 C818.42,830.32 833.92,868.73 843.64,892.82 " fill="none" id="Aggregator-backto-NavigationAggregator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="799.44,802,798.45,780.83,812.42,796.76,799.44,802" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[02363c8b3a49bab427c3799533d1b7f7]
-reverse link ObjectList to to.layout.Layout--><path codeLine="92" d="M665.25,1114.35 C648.88,1145.91 629.45,1183.36 617.18,1207.03 " fill="none" id="ObjectList-backto-to.layout.Layout" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="671.35,1102.59,665.037,1106.075,665.8258,1113.2429,672.1389,1109.7578,671.35,1102.59" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2683420a5b2a98e1bda227ab530b68b6]
-link EventStore to PES--><path codeLine="95" d="M676.24,274.52 C677.81,298.7 679.47,324.45 680.61,341.99 " fill="none" id="EventStore-PES" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[dc7d639b028d6d86f7d7b80029c66660]
-link PES to LogEntry--><path codeLine="96" d="M679.71,387.18 C677.48,408.33 673.93,441.96 670.52,474.28 " fill="none" id="PES-LogEntry" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[9256243b97998dd164b7f3e89ee2f45c]
-link PR to PES--><path codeLine="99" d="M771.32,230.81 C751.5,260.25 716.39,312.41 696.61,341.8 " fill="none" id="PR-PES" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[28e9bca5f42469f8883209bd5c5a0e39]
-link PR to Aggregator--><path codeLine="100" d="M786,230.8 C786,314.99 786,619.16 786,717.27 " fill="none" id="PR-Aggregator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[d31448e9a5db4a2225787fd4cb7fe347]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1336px" preserveAspectRatio="none" style="width:1134px;height:1336px;" version="1.1" viewBox="0 0 1134 1336" width="1134px" zoomAndPan="magnify"><defs><filter height="300%" id="f18wh9ue8dxqp9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><fe [...]
+cluster remote--><polygon fill="#FFFFFF" filter="url(#f18wh9ue8dxqp9)" points="845,120,855,110,1117,110,1117,380.5,1107,390.5,845,390.5,845,120" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1107" x2="1117" y1="120" y2="110"/><line style="stroke:#000000;stroke-width:1.5;" x1="845" x2="1107" y1="120" y2="120"/><line style="stroke:#000000;stroke-width:1.5;" x1="1107" x2="1107" y1="120" y2="390.5"/><text fill="#000000" font-family="sans-serif"  [...]
+cluster to--><polygon fill="#FFFFFF" filter="url(#f18wh9ue8dxqp9)" points="16,789.5,36,789.5,43,812.2999,500,812.2999,500,1329.5,16,1329.5,16,789.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="43" y1="812.2999" y2="812.2999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="14" x="20" y="805.4999">to</text><!--MD5=[ccc460d39f96760bc67bdadf7a404591]
+cluster to.layout--><polygon fill="#FFFFFF" filter="url(#f18wh9ue8dxqp9)" points="551,1100.5,617,1100.5,624,1123.2999,651,1123.2999,651,1218.5,551,1218.5,551,1100.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="551" x2="624" y1="1123.2999" y2="1123.2999"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="60" x="555" y="1116.4999">to.layout</text><!--MD5=[5f5aa3eac08eb7d12d88ff [...]
+class RestfulObjects--><rect codeLine="42" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="RestfulObjects" style="stroke:#A80036;stroke-width:1.5;" width="110" x="862" y="174"/><ellipse cx="877" cy="190" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M879.6719,193.2969 Q880.2188,193.2969 880.5,193.4844 Q880.7813,193.6563 880.7813,194.1563 Q880.7813,195 879.6719,195 L874.5313,195 Q873.4063,195 873.4063,194.1563 Q873.4063,193.6563 873.6875,19 [...]
+class ApacheIsis--><rect codeLine="43" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="54.8002" id="ApacheIsis" style="stroke:#A80036;stroke-width:1.5;" width="98" x="861" y="319.5"/><ellipse cx="876" cy="338.9001" fill="#FF7700" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M876.9531,342.5564 Q876.9531,342.0564 877.2344,341.8845 Q877.5313,341.697 878.0781,341.697 L878.4688,341.697 L878.0781,340.7126 L874.0313,340.7126 L873.6406,341.697 L874.0313,341.697 Q875.14 [...]
+class NakedObjects--><rect codeLine="44" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="54.8002" id="NakedObjects" style="stroke:#A80036;stroke-width:1.5;" width="107" x="994.5" y="319.5"/><ellipse cx="1009.5" cy="338.9001" fill="#FF7700" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1010.4531,342.5564 Q1010.4531,342.0564 1010.7344,341.8845 Q1011.0313,341.697 1011.5781,341.697 L1011.9688,341.697 L1011.5781,340.7126 L1007.5313,340.7126 L1007.1406,341.697 L1007. [...]
+class to.Link--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Link" style="stroke:#A80036;stroke-width:1.5;" width="54" x="403" y="985.5"/><ellipse cx="418" cy="1001.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M417.3594,1005.2813 Q418.1563,1005.2813 418.7188,1005.0938 Q419.2969,1004.8906 419.5313,1004.6719 Q419.7813,1004.4375 420.0156,1004.25 Q420.2656,1004.0469 420.4844,1004.0469 Q420.8281,1004.0469 421.0781,1004.3125 Q421 [...]
+class to.Extensions--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Extensions" style="stroke:#A80036;stroke-width:1.5;" width="88" x="396" y="1154.5"/><ellipse cx="411" cy="1170.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M410.3594,1174.2813 Q411.1563,1174.2813 411.7188,1174.0938 Q412.2969,1173.8906 412.5313,1173.6719 Q412.7813,1173.4375 413.0156,1173.25 Q413.2656,1173.0469 413.4844,1173.0469 Q413.8281,1173.0469 414.0781,1 [...]
+class to.Linked--><rect codeLine="56" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="61.1999" id="to.Linked" style="stroke:#A80036;stroke-width:1.5;" width="68" x="276" y="843.5"/><ellipse cx="291" cy="859.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M293.6719,862.7969 Q294.2188,862.7969 294.5,862.9844 Q294.7813,863.1563 294.7813,863.6563 Q294.7813,864.5 293.6719,864.5 L288.5313,864.5 Q287.4063,864.5 287.4063,863.6563 Q287.4063,863.1563 287.6 [...]
+class to.Result--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Result" style="stroke:#A80036;stroke-width:1.5;" width="65" x="32.5" y="985.5"/><ellipse cx="47.5" cy="1001.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M46.8594,1005.2813 Q47.6563,1005.2813 48.2188,1005.0938 Q48.7969,1004.8906 49.0313,1004.6719 Q49.2813,1004.4375 49.5156,1004.25 Q49.7656,1004.0469 49.9844,1004.0469 Q50.3281,1004.0469 50.5781,1004.3125 Q50.8438, [...]
+class to.ResultList--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.ResultList" style="stroke:#A80036;stroke-width:1.5;" width="84" x="133" y="985.5"/><ellipse cx="148" cy="1001.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M147.3594,1005.2813 Q148.1563,1005.2813 148.7188,1005.0938 Q149.2969,1004.8906 149.5313,1004.6719 Q149.7813,1004.4375 150.0156,1004.25 Q150.2656,1004.0469 150.4844,1004.0469 Q150.8281,1004.0469 151.0781,10 [...]
+class to.Extended--><rect codeLine="64" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="61.1999" id="to.Extended" style="stroke:#A80036;stroke-width:1.5;" width="116" x="252" y="979"/><ellipse cx="281.85" cy="995" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M284.5219,998.2969 Q285.0688,998.2969 285.35,998.4844 Q285.6313,998.6563 285.6313,999.1563 Q285.6313,1000 284.5219,1000 L279.3813,1000 Q278.2563,1000 278.2563,999.1563 Q278.2563,998.6563 278. [...]
+class to.Property--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Property" style="stroke:#A80036;stroke-width:1.5;" width="76" x="32" y="1154.5"/><ellipse cx="47" cy="1170.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M46.3594,1174.2813 Q47.1563,1174.2813 47.7188,1174.0938 Q48.2969,1173.8906 48.5313,1173.6719 Q48.7813,1173.4375 49.0156,1173.25 Q49.2656,1173.0469 49.4844,1173.0469 Q49.8281,1173.0469 50.0781,1173.3125 Q50.3438 [...]
+class to.TObject--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.TObject" style="stroke:#A80036;stroke-width:1.5;" width="74" x="143" y="1154.5"/><ellipse cx="158" cy="1170.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M157.3594,1174.2813 Q158.1563,1174.2813 158.7188,1174.0938 Q159.2969,1173.8906 159.5313,1173.6719 Q159.7813,1173.4375 160.0156,1173.25 Q160.2656,1173.0469 160.4844,1173.0469 Q160.8281,1173.0469 161.0781,1173.31 [...]
+class to.Service--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Service" style="stroke:#A80036;stroke-width:1.5;" width="71" x="252.5" y="1154.5"/><ellipse cx="267.5" cy="1170.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M266.8594,1174.2813 Q267.6563,1174.2813 268.2188,1174.0938 Q268.7969,1173.8906 269.0313,1173.6719 Q269.2813,1173.4375 269.5156,1173.25 Q269.7656,1173.0469 269.9844,1173.0469 Q270.3281,1173.0469 270.5781,117 [...]
+class to.Member--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.Member" style="stroke:#A80036;stroke-width:1.5;" width="75" x="286.5" y="1265.5"/><ellipse cx="301.5" cy="1281.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M300.8594,1285.2813 Q301.6563,1285.2813 302.2188,1285.0938 Q302.7969,1284.8906 303.0313,1284.6719 Q303.2813,1284.4375 303.5156,1284.25 Q303.7656,1284.0469 303.9844,1284.0469 Q304.3281,1284.0469 304.5781,1284. [...]
+class to.layout.Layout--><rect fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="to.layout.Layout" style="stroke:#A80036;stroke-width:1.5;" width="67" x="567.5" y="1154.5"/><ellipse cx="582.5" cy="1170.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M581.8594,1174.2813 Q582.6563,1174.2813 583.2188,1174.0938 Q583.7969,1173.8906 584.0313,1173.6719 Q584.2813,1173.4375 584.5156,1173.25 Q584.7656,1173.0469 584.9844,1173.0469 Q585.3281,1173.0469  [...]
+class XHR--><rect codeLine="2" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="61.1999" id="XHR" style="stroke:#A80036;stroke-width:1.5;" width="58" x="535" y="167.5"/><ellipse cx="550" cy="183.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M549.3594,187.2813 Q550.1563,187.2813 550.7188,187.0938 Q551.2969,186.8906 551.5313,186.6719 Q551.7813,186.4375 552.0156,186.25 Q552.2656,186.0469 552.4844,186.0469 Q552.8281,186.0469 553.0781,186.3125 Q553.3 [...]
+class EventStore--><rect codeLine="6" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="120.7997" id="EventStore" style="stroke:#A80036;stroke-width:1.5;" width="88" x="628" y="137.5"/><ellipse cx="643" cy="156.9001" fill="#FF7700" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M645.9531,151.7439 Q646.4688,151.7439 646.625,152.0407 Q646.7813,152.322 646.7813,152.8689 L646.7813,154.3689 Q646.7813,155.5095 645.9531,155.5095 Q645.8125,155.5095 645.7031,155.4939 Q645.5 [...]
+class LogEntry--><rect codeLine="14" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="166.7991" id="LogEntry" style="stroke:#A80036;stroke-width:1.5;" width="122" x="601" y="453.5"/><ellipse cx="635.35" cy="469.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M634.7094,473.2813 Q635.5063,473.2813 636.0688,473.0938 Q636.6469,472.8906 636.8813,472.6719 Q637.1313,472.4375 637.3656,472.25 Q637.6156,472.0469 637.8344,472.0469 Q638.1781,472.0469 638.4281 [...]
+class TransferObject--><rect codeLine="52" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="TransferObject" style="stroke:#A80036;stroke-width:1.5;" width="111" x="443.5" y="688"/><ellipse cx="458.5" cy="704" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M461.1719,707.2969 Q461.7188,707.2969 462,707.4844 Q462.2813,707.6563 462.2813,708.1563 Q462.2813,709 461.1719,709 L456.0313,709 Q454.9063,709 454.9063,708.1563 Q454.9063,707.6563 455.1875, [...]
+class Aggregator--><rect codeLine="75" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="61.1999" id="Aggregator" style="stroke:#A80036;stroke-width:1.5;" width="93" x="742.5" y="681.5"/><ellipse cx="757.5" cy="697.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M760.1719,700.7969 Q760.7188,700.7969 761,700.9844 Q761.2813,701.1563 761.2813,701.6563 Q761.2813,702.5 760.1719,702.5 L755.0313,702.5 Q753.9063,702.5 753.9063,701.6563 Q753.9063,701.1563 7 [...]
+class ResponseHandler--><rect codeLine="29" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="107.5998" id="ResponseHandler" style="stroke:#A80036;stroke-width:1.5;" width="201" x="261.5" y="144"/><ellipse cx="276.5" cy="163.4001" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M275.8594,167.1814 Q276.6563,167.1814 277.2188,166.9939 Q277.7969,166.7907 278.0313,166.572 Q278.2813,166.3376 278.5156,166.1501 Q278.7656,165.947 278.9844,165.947 Q279.3281,16 [...]
+class ListAggregator--><rect codeLine="78" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="61.1999" id="ListAggregator" style="stroke:#A80036;stroke-width:1.5;" width="110" x="635" y="843.5"/><ellipse cx="650" cy="859.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M649.3594,863.2813 Q650.1563,863.2813 650.7188,863.0938 Q651.2969,862.8906 651.5313,862.6719 Q651.7813,862.4375 652.0156,862.25 Q652.2656,862.0469 652.4844,862.0469 Q652.8281,862.0469  [...]
+class ObjectList--><rect codeLine="87" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="87.5997" id="ObjectList" style="stroke:#A80036;stroke-width:1.5;" width="112" x="634" y="965.5"/><ellipse cx="661.15" cy="981.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M660.5094,985.2813 Q661.3063,985.2813 661.8688,985.0938 Q662.4469,984.8906 662.6813,984.6719 Q662.9313,984.4375 663.1656,984.25 Q663.4156,984.0469 663.6344,984.0469 Q663.9781,984.0469 664.2 [...]
+class NavigationAggregator--><rect codeLine="84" fill="#FEFECE" filter="url(#f18wh9ue8dxqp9)" height="48" id="NavigationAggregator" style="stroke:#A80036;stroke-width:1.5;" width="148" x="780" y="850"/><ellipse cx="795" cy="866" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M794.3594,869.7813 Q795.1563,869.7813 795.7188,869.5938 Q796.2969,869.3906 796.5313,869.1719 Q796.7813,868.9375 797.0156,868.75 Q797.2656,868.5469 797.4844,868.5469 Q797.8281,868.54 [...]
+reverse link EventStore to LogEntry--><path codeLine="25" d="M631.71,270.94 C624.79,286.51 618.66,303.2 615,319.5 C605.08,363.69 614.22,413.03 627,453.44 " fill="none" id="EventStore-backto-LogEntry" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="637.39,258.73,631.2317,262.4817,632.3262,269.6092,638.4845,265.8576,637.39,258.73" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c66ef044075bfa520abea1b298c82d62]
+reverse link LogEntry to TransferObject--><path codeLine="26" d="M591.88,612.42 C566.33,639.54 539.25,668.28 520.97,687.68 " fill="none" id="LogEntry-backto-TransferObject" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="600.84,602.91,593.815,604.5377,592.6156,611.6484,599.6406,610.0207,600.84,602.91" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1323f1ce2513c9cf1e00c7aff6d8ac1a]
+reverse link LogEntry to Aggregator--><path codeLine="27" d="M730.56,631.39 C743.86,649.51 756.86,667.22 767.21,681.32 " fill="none" id="LogEntry-backto-Aggregator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="722.71,620.7,723.0355,627.9038,729.8104,630.3739,729.4848,623.1702,722.71,620.7" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c99a35cbbebd0771999276ef9d68dcaa]
+link ResponseHandler to XHR--><path codeLine="35" d="M462.7,198 C486.91,198 511.14,198 529.84,198 " fill="none" id="ResponseHandler-to-XHR" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="534.96,198,525.96,194,529.96,198,525.96,202,534.96,198" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="479.75,186.8,488.7951,189.7389,488.7951,183.8611,479.75,186.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-seri [...]
+link ResponseHandler to TransferObject--><path codeLine="36" d="M362.12,252.25 C364.11,334.57 375.27,496.2 429,620.5 C439.26,644.23 457.18,667.23 472.32,684.1 " fill="none" id="ResponseHandler-to-TransferObject" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#A80036" points="475.7,687.82,472.5769,678.4794,472.3253,684.1307,466.674,683.879,475.7,687.82" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" [...]
+link XHR to EventStore--><path codeLine="38" d="M593.11,198 C602.99,198 612.88,198 622.76,198 " fill="none" id="XHR-to-EventStore" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="627.93,198,618.93,194,622.93,198,618.93,202,627.93,198" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1b036d3bee70abab8c1eec6380d9d2d0]
+reverse link RestfulObjects to ApacheIsis--><path codeLine="46" d="M914.93,242.41 C913.74,267.36 912.29,297.9 911.27,319.33 " fill="none" id="RestfulObjects-backto-ApacheIsis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="907.95,241.94,915.89,222.29,921.93,242.6,907.95,241.94" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ff455b0d12e54cd289f5a016df291ab1]
+reverse link RestfulObjects to NakedObjects--><path codeLine="47" d="M951.37,237.57 C974.31,263.31 1003.88,296.49 1024.24,319.33 " fill="none" id="RestfulObjects-backto-NakedObjects" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="945.84,241.88,937.76,222.29,956.29,232.57,945.84,241.88" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1cde971cbfc4340e811b59a359229905]
+link XHR to RestfulObjects--><path codeLine="48" d="M570.13,167.13 C576.35,144.84 588.39,116.24 611,102 C667.97,66.11 695.17,100.59 762.5,101 C799.17,101.22 812.3,85.4 845,102 C872.75,116.09 892.63,146.42 904.38,169.24 " fill="none" id="XHR-to-RestfulObjects" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="906.76,173.99,906.3002,164.1519,904.5182,169.5207,899.1494,167.7387,906.76,173.99" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family= [...]
+reverse link XHR to RestfulObjects--><path codeLine="49" d="M571.62,162.07 C578.19,140.67 590.07,115.19 611,102 C667.97,66.11 695.17,100.59 762.5,101 C799.17,101.22 812.3,85.4 845,102 C874.72,117.09 895.42,150.82 906.76,173.99 " fill="none" id="XHR-backto-RestfulObjects" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="570.13,167.13,576.5106,159.6275,571.5431,162.3339,568.8368,157.3664,570.13,167.13" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000"  [...]
+reverse link TransferObject to to.Link--><path codeLine="53" d="M488.12,755.69 C486.71,761.34 485.31,767.06 484,772.5 C465.28,850.35 444.52,943.02 435.12,985.35 " fill="none" id="TransferObject-backto-to.Link" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="481.37,753.83,493.04,736.14,494.94,757.25,481.37,753.83" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b54b6402f2c0aeee3f02bd164175ae12]
+reverse link TransferObject to to.Extensions--><path codeLine="54" d="M499,756.71 C498.3,821.89 494.28,948.17 475,1053.5 C468.43,1089.37 456.04,1129.83 447.9,1154.5 " fill="none" id="TransferObject-backto-to.Extensions" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="492,756.3,499.12,736.34,506,756.39,492,756.3" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b581451216a7d46b23357fd86de0a340]
+reverse link TransferObject to to.layout.Layout--><path codeLine="55" d="M517.77,754.59 C520.07,760.53 522.23,766.62 524,772.5 C566.77,914.35 590.72,1091.6 598.32,1154.26 " fill="none" id="TransferObject-backto-to.layout.Layout" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="511.27,757.19,510.01,736.04,524.19,751.79,511.27,757.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0292e4433c127d38dd87063e03d1827b]
+reverse link TransferObject to to.Linked--><path codeLine="59" d="M442.72,747.03 C430.91,754.93 418.77,763.64 408,772.5 C381.65,794.18 354.82,822.2 335.9,843.15 " fill="none" id="TransferObject-backto-to.Linked" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="439.02,741.09,459.61,736.11,446.62,752.85,439.02,741.09" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[da56766a10462bcc890735f4ba220c5c]
+reverse link to.Linked to to.Result--><path codeLine="60" d="M257.03,894.93 C216.6,911.23 160.33,936.29 115,965.5 C106.05,971.27 97,978.52 89.11,985.42 " fill="none" id="to.Linked-backto-to.Result" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="254.58,888.37,275.76,887.55,259.72,901.4,254.58,888.37" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[609a7d2eede23fcf68d875f7da410297]
+reverse link to.Linked to to.ResultList--><path codeLine="61" d="M265.67,918.84 C243.3,940.95 217.08,966.89 198.6,985.16 " fill="none" id="to.Linked-backto-to.ResultList" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="260.9,913.71,280.04,904.63,270.74,923.67,260.9,913.71" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2344372b37003ed52512b79ad8325196]
+reverse link to.Linked to to.Extended--><path codeLine="62" d="M310,924.83 C310,943.05 310,963.07 310,978.95 " fill="none" id="to.Linked-backto-to.Extended" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="303,924.63,310,904.63,317,924.63,303,924.63" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[003c6c4f33e5a65c22164ded883e5d46]
+reverse link to.Linked to to.Link--><path codeLine="67" d="M345.46,914.45 C366.13,937.45 391.5,965.66 409.02,985.16 " fill="none" id="to.Linked-backto-to.Link" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="336.63,904.63,337.6689,911.7659,344.6554,913.5515,343.6165,906.4156,336.63,904.63" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3bc29dac53101b63679b8c6ff6e02894]
+reverse link to.Extended to to.Extensions--><path codeLine="68" d="M342.7,1050.47 C351.32,1061.15 360.57,1072.71 369,1083.5 C387.64,1107.35 408.46,1135.04 422.7,1154.16 " fill="none" id="to.Extended-backto-to.Extensions" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="334.34,1040.16,335.0103,1047.3399,341.8957,1049.4826,341.2254,1042.3028,334.34,1040.16" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cb8c64333b052217f1b563adf04eefcf]
+reverse link to.Extended to to.Property--><path codeLine="69" d="M242.22,1049.6 C239.46,1050.95 236.71,1052.26 234,1053.5 C187.22,1074.91 165.33,1060.55 125,1092.5 C104.34,1108.87 89,1135.24 79.85,1154.27 " fill="none" id="to.Extended-backto-to.Property" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="239.37,1043.19,260.35,1040.19,245.82,1055.62,239.37,1043.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1a07ac71847d082ca2d8e7391285ac3d]
+reverse link to.Extended to to.TObject--><path codeLine="70" d="M266.85,1054.98 C256.04,1066.83 244.76,1079.87 235,1092.5 C219.53,1112.53 204.06,1136.92 193.49,1154.43 " fill="none" id="to.Extended-backto-to.TObject" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="261.85,1050.07,280.61,1040.2,272.1,1059.61,261.85,1050.07" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[09c2f7ddeb4aba1e4193c5b221896601]
+reverse link to.Extended to to.Service--><path codeLine="71" d="M303.42,1060.45 C299.32,1091.59 294.23,1130.2 291.05,1154.35 " fill="none" id="to.Extended-backto-to.Service" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="296.51,1059.27,306.07,1040.36,310.39,1061.1,296.51,1059.27" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f58379db15f2c16fbc74c274baa5ffca]
+reverse link to.Extended to to.Member--><path codeLine="72" d="M331.65,1059.08 C335.53,1069.88 338.97,1081.41 341,1092.5 C351.7,1151.09 348.95,1167.48 341,1226.5 C339.24,1239.55 335.49,1253.74 331.96,1265.25 " fill="none" id="to.Extended-backto-to.Member" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="325,1061.3,324.17,1040.13,338.02,1056.16,325,1061.3" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d5af093094f02e9038ff511b3336013b]
+reverse link to.Service to to.Member--><path codeLine="73" d="M299.78,1215.16 C305.23,1231.68 311.56,1250.83 316.38,1265.42 " fill="none" id="to.Service-backto-to.Member" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#FFFFFF" points="295.63,1202.62,293.7181,1209.573,299.401,1214.0121,301.3129,1207.059,295.63,1202.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b4780f69cd9b953410ea31178db59d43]
+reverse link ListAggregator to ObjectList--><path codeLine="81" d="M690,917.9 C690,933.06 690,950.09 690,965.27 " fill="none" id="ListAggregator-backto-ObjectList" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="690,904.63,686,910.63,690,916.63,694,910.63,690,904.63" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[126f787ca14dc3fd6cd015a28b3d8c4c]
+reverse link Aggregator to ListAggregator--><path codeLine="82" d="M760.02,759.84 C743.3,786.86 722.78,820.02 708.29,843.44 " fill="none" id="Aggregator-backto-ListAggregator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="754.13,756.04,770.61,742.72,766.04,763.41,754.13,756.04" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b4aab1c3b82142bf25eafd68b215e7d9]
+reverse link Aggregator to NavigationAggregator--><path codeLine="85" d="M808.76,761.64 C820.63,790.85 835.18,826.68 844.52,849.67 " fill="none" id="Aggregator-backto-NavigationAggregator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="802.12,763.88,801.07,742.72,815.09,758.61,802.12,763.88" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[02363c8b3a49bab427c3799533d1b7f7]
+reverse link ObjectList to to.layout.Layout--><path codeLine="92" d="M660.86,1065.18 C644.78,1095.35 625.65,1131.25 613.42,1154.2 " fill="none" id="ObjectList-backto-to.layout.Layout" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="667.08,1053.51,660.7279,1056.9234,661.4357,1064.0997,667.7877,1060.6863,667.08,1053.51" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2683420a5b2a98e1bda227ab530b68b6]
+link EventStore to PES--><path codeLine="95" d="M676.88,258.79 C678.85,282.95 680.99,309.17 682.41,326.48 " fill="none" id="EventStore-PES" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[dc7d639b028d6d86f7d7b80029c66660]
+link PES to LogEntry--><path codeLine="96" d="M681.69,367.76 C679.29,388.22 675.39,421.56 671.69,453.18 " fill="none" id="PES-LogEntry" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[9256243b97998dd164b7f3e89ee2f45c]
+link PR to PES--><path codeLine="99" d="M775.06,218.52 C754.97,246.64 718.12,298.24 698,326.4 " fill="none" id="PR-PES" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[28e9bca5f42469f8883209bd5c5a0e39]
+link PR to Aggregator--><path codeLine="100" d="M789,218.76 C789,297.23 789,587.18 789,681.29 " fill="none" id="PR-Aggregator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><!--MD5=[96cfb953db077f53c7e12a1e656ecbe4]
 @startuml
 
 class XHR {
@@ -169,7 +169,7 @@ note "<<Pattern>>\nAggregator" as PA
 PA .. Aggregator
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/diag-ff22daefe9416de25bf9c48b18681d35d0854a6a.svg b/content/incubator/2.0.0-M5/kroviz/_images/diag-ff22daefe9416de25bf9c48b18681d35d0854a6a.svg
index 92f321b..660a587 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/diag-ff22daefe9416de25bf9c48b18681d35d0854a6a.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/diag-ff22daefe9416de25bf9c48b18681d35d0854a6a.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1199px" preserveAspectRatio="none" style="width:864px;height:1199px;" version="1.1" viewBox="0 0 864 1199" width="864px" zoomAndPan="magnify"><defs><filter height="300%" id="fx4p8xw8jr0ys" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColo [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1157px" preserveAspectRatio="none" style="width:860px;height:1157px;" version="1.1" viewBox="0 0 860 1157" width="860px" zoomAndPan="magnify"><defs><filter height="300%" id="fx4p8xw8jr0ys" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColo [...]
 @startmindmap
 +_ know\nhow
 - -_ basics
@@ -52,7 +52,7 @@
 - - - JavaScript
 @endmindmap
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/incubator/2.0.0-M5/kroviz/about.html b/content/incubator/2.0.0-M5/kroviz/about.html
index eb7cc9a..ce29b9c 100644
--- a/content/incubator/2.0.0-M5/kroviz/about.html
+++ b/content/incubator/2.0.0-M5/kroviz/about.html
@@ -397,7 +397,7 @@ Krovix is called a "client" (rather than a "viewer") because it runs within the
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/kroviz/credits.html b/content/incubator/2.0.0-M5/kroviz/credits.html
index 4e32dc3..91f94e6 100644
--- a/content/incubator/2.0.0-M5/kroviz/credits.html
+++ b/content/incubator/2.0.0-M5/kroviz/credits.html
@@ -502,7 +502,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/kroviz/regression-test.html b/content/incubator/2.0.0-M5/kroviz/regression-test.html
index d7650db..a30e258 100644
--- a/content/incubator/2.0.0-M5/kroviz/regression-test.html
+++ b/content/incubator/2.0.0-M5/kroviz/regression-test.html
@@ -436,7 +436,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/incubator/2.0.0-M5/vaadin/about.html b/content/incubator/2.0.0-M5/vaadin/about.html
index 6e55c70..0a954f8 100644
--- a/content/incubator/2.0.0-M5/vaadin/about.html
+++ b/content/incubator/2.0.0-M5/vaadin/about.html
@@ -404,7 +404,7 @@ TODO:  v2.0
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/about.html b/content/legacy/2.0.0-M5/about.html
index 6d8909d..c2df8fa 100644
--- a/content/legacy/2.0.0-M5/about.html
+++ b/content/legacy/2.0.0-M5/about.html
@@ -391,7 +391,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/applib/about.html b/content/legacy/2.0.0-M5/applib/about.html
index 81e5e0e..ddf2c99 100644
--- a/content/legacy/2.0.0-M5/applib/about.html
+++ b/content/legacy/2.0.0-M5/applib/about.html
@@ -402,7 +402,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/commons/about.html b/content/legacy/2.0.0-M5/commons/about.html
index 0acbbfb..7f23e4f 100644
--- a/content/legacy/2.0.0-M5/commons/about.html
+++ b/content/legacy/2.0.0-M5/commons/about.html
@@ -402,7 +402,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/metamodel/about.html b/content/legacy/2.0.0-M5/metamodel/about.html
index b11cf6c..5f74b97 100644
--- a/content/legacy/2.0.0-M5/metamodel/about.html
+++ b/content/legacy/2.0.0-M5/metamodel/about.html
@@ -400,7 +400,7 @@ TODO: v2: to document
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/restclient/about.html b/content/legacy/2.0.0-M5/restclient/about.html
index 5411006..d180913 100644
--- a/content/legacy/2.0.0-M5/restclient/about.html
+++ b/content/legacy/2.0.0-M5/restclient/about.html
@@ -402,7 +402,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/runtime/about.html b/content/legacy/2.0.0-M5/runtime/about.html
index 8969d03..40f571c 100644
--- a/content/legacy/2.0.0-M5/runtime/about.html
+++ b/content/legacy/2.0.0-M5/runtime/about.html
@@ -402,7 +402,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/legacy/2.0.0-M5/servletapi/about.html b/content/legacy/2.0.0-M5/servletapi/about.html
index 86ee1b8..980cfe2 100644
--- a/content/legacy/2.0.0-M5/servletapi/about.html
+++ b/content/legacy/2.0.0-M5/servletapi/about.html
@@ -400,7 +400,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/mappings/2.0.0-M5/about.html b/content/mappings/2.0.0-M5/about.html
index 9ced144..227ce26 100644
--- a/content/mappings/2.0.0-M5/about.html
+++ b/content/mappings/2.0.0-M5/about.html
@@ -396,7 +396,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/mappings/2.0.0-M5/jaxrsclient/about.html b/content/mappings/2.0.0-M5/jaxrsclient/about.html
index d08ecbc..28fa7a9 100644
--- a/content/mappings/2.0.0-M5/jaxrsclient/about.html
+++ b/content/mappings/2.0.0-M5/jaxrsclient/about.html
@@ -368,18 +368,25 @@ page.parent doesn't seem to be set...
 <article class="doc">
     <a name="section-top"></a>
 <h1 class="page">JAX-RS Client Library</h1>
-<div class="admonitionblock warning">
+<div class="paragraph">
+<p>Consider the use case where an Apache Isis app emits "thin" events to an ESB, for example using the <a href="../outbox-publisher/about.html" class="page">Outbox Publisher</a>.
+The ESB then queries back to the Apache Isis app to get extra info in a canonical DTO form in order to continue processing.</p>
+</div>
+<div class="admonitionblock tip">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
+<i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
-TODO
+for more on this use case, try searching on "<a href="https://www.google.com/search?q=fat+vs+thin+events">fat vs thin events</a>".
 </td>
 </tr>
 </table>
 </div>
+<div class="paragraph">
+<p>This library, then, provides a bit of code to construct the correct <code>Accept-Type</code> headers, in a format that is then interpreted by an application-specific implementation of <a href="../../../refguide/2.0.0-M5/applib/index/services/conmap/ContentMappingService.html" class="page">ContentMappingService</a>.</p>
+</div>
 </article>
 <aside class="article-aside toc hide-for-print" role="navigation">
     <p class="toc-title">On this page</p>
@@ -397,7 +404,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/mappings/2.0.0-M5/minio/about.html b/content/mappings/2.0.0-M5/minio/about.html
index cc5bd81..1d56509 100644
--- a/content/mappings/2.0.0-M5/minio/about.html
+++ b/content/mappings/2.0.0-M5/minio/about.html
@@ -395,7 +395,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/mappings/2.0.0-M5/outbox-publisher/about.html b/content/mappings/2.0.0-M5/outbox-publisher/about.html
index 4d6a9dd..e92a182 100644
--- a/content/mappings/2.0.0-M5/outbox-publisher/about.html
+++ b/content/mappings/2.0.0-M5/outbox-publisher/about.html
@@ -395,7 +395,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/mappings/2.0.0-M5/restclient/about.html b/content/mappings/2.0.0-M5/restclient/about.html
index 9b3b41d..e5851c8 100644
--- a/content/mappings/2.0.0-M5/restclient/about.html
+++ b/content/mappings/2.0.0-M5/restclient/about.html
@@ -367,17 +367,11 @@ page.parent doesn't seem to be set...
 <article class="doc">
     <a name="section-top"></a>
 <h1 class="page">REST Client</h1>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
+<div class="paragraph">
+<p>This library is for integration scenario to programmatically invoke the <a href="../../../vro/2.0.0-M5/about.html" class="page">REST API (Restful Objects Viewer)</a> of an Apache Isis application, using the <a href="http://restfulobjects.org">restfulobjects protocol</a>.</p>
+</div>
+<div class="paragraph">
+<p>A common use case would be to consume information from some external system, for example uploading a scanned PDF or a representation of an incoming invoice.</p>
 </div>
 </article>
 <aside class="article-aside toc hide-for-print" role="navigation">
@@ -396,7 +390,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/mappings/2.0.0-M5/slack/about.html b/content/mappings/2.0.0-M5/slack/about.html
index 559fae3..7c3010d 100644
--- a/content/mappings/2.0.0-M5/slack/about.html
+++ b/content/mappings/2.0.0-M5/slack/about.html
@@ -395,7 +395,7 @@ TODO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/about.html b/content/pjdo/2.0.0-M5/about.html
index 86c89fa..138029d 100644
--- a/content/pjdo/2.0.0-M5/about.html
+++ b/content/pjdo/2.0.0-M5/about.html
@@ -417,7 +417,7 @@ DataNucleus is the reference implementation for JDO.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/configuring/disabling-persistence-by-reachability.html b/content/pjdo/2.0.0-M5/configuring/disabling-persistence-by-reachability.html
index bf37229..15c32f5 100644
--- a/content/pjdo/2.0.0-M5/configuring/disabling-persistence-by-reachability.html
+++ b/content/pjdo/2.0.0-M5/configuring/disabling-persistence-by-reachability.html
@@ -534,7 +534,7 @@ However, since the <code>Party</code> is not yet in-memory, using the <code>refe
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/db-schemas.html b/content/pjdo/2.0.0-M5/db-schemas.html
index 071c60a..acaabb6 100644
--- a/content/pjdo/2.0.0-M5/db-schemas.html
+++ b/content/pjdo/2.0.0-M5/db-schemas.html
@@ -497,7 +497,7 @@ This should be an idempotent command, with the default being SQL-99 compliant:</
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/dependency-injection.html b/content/pjdo/2.0.0-M5/dependency-injection.html
index 0d2e843..885ae48 100644
--- a/content/pjdo/2.0.0-M5/dependency-injection.html
+++ b/content/pjdo/2.0.0-M5/dependency-injection.html
@@ -417,7 +417,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/enhancer.html b/content/pjdo/2.0.0-M5/enhancer.html
index d69c6db..9b2faf8 100644
--- a/content/pjdo/2.0.0-M5/enhancer.html
+++ b/content/pjdo/2.0.0-M5/enhancer.html
@@ -425,7 +425,7 @@ See <a href="../../setupguide/2.0.0-M5/about.html" class="page">setup guides</a>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips.html b/content/pjdo/2.0.0-M5/hints-and-tips.html
index 511987c..845b6e6 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips.html
@@ -878,7 +878,7 @@ ORDER BY this.timestamp ASC             <i class="conum" data-value="1"></i><b>(
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips/diagnosing-n-plus-1.html b/content/pjdo/2.0.0-M5/hints-and-tips/diagnosing-n-plus-1.html
index 2aee36e..e0e16d7 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips/diagnosing-n-plus-1.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips/diagnosing-n-plus-1.html
@@ -425,7 +425,7 @@ See <a href="../hints-and-tips.html#typesafe-queries-and-fetchgroups" class="pag
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips/java8.html b/content/pjdo/2.0.0-M5/hints-and-tips/java8.html
index f0959c7..fa84583 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips/java8.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips/java8.html
@@ -452,7 +452,7 @@ listing version compatibility of these extensions vis-a-vis the core DataNucleus
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips/jdoql-and-timestamps.html b/content/pjdo/2.0.0-M5/hints-and-tips/jdoql-and-timestamps.html
index 6fa4dbb..15a72f4 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips/jdoql-and-timestamps.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips/jdoql-and-timestamps.html
@@ -508,7 +508,7 @@ ORDER BY this.timestamp ASC             <i class="conum" data-value="1"></i><b>(
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips/overriding-jdo-annotations.html b/content/pjdo/2.0.0-M5/hints-and-tips/overriding-jdo-annotations.html
index 236b807..56b91ac 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips/overriding-jdo-annotations.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips/overriding-jdo-annotations.html
@@ -498,7 +498,7 @@ This is done using the pass-thru <code>datanucleus.Mapping</code> configuration
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips/subtype-entity-not-fully-populated.html b/content/pjdo/2.0.0-M5/hints-and-tips/subtype-entity-not-fully-populated.html
index c7e8501..d72893b 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips/subtype-entity-not-fully-populated.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips/subtype-entity-not-fully-populated.html
@@ -479,7 +479,7 @@ This is preferable to doing a left outer join from the super- to the subtype tab
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/hints-and-tips/typesafe-queries-and-fetchgroups.html b/content/pjdo/2.0.0-M5/hints-and-tips/typesafe-queries-and-fetchgroups.html
index dfdc0d5..cea0874 100644
--- a/content/pjdo/2.0.0-M5/hints-and-tips/typesafe-queries-and-fetchgroups.html
+++ b/content/pjdo/2.0.0-M5/hints-and-tips/typesafe-queries-and-fetchgroups.html
@@ -523,7 +523,7 @@ Putting this all together, we get:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/mapping-guide.html b/content/pjdo/2.0.0-M5/mapping-guide.html
index 118b664..2ca1c6e 100644
--- a/content/pjdo/2.0.0-M5/mapping-guide.html
+++ b/content/pjdo/2.0.0-M5/mapping-guide.html
@@ -441,7 +441,7 @@ Take a look at:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/mapping-guide/mandatory-properties-in-subtypes.html b/content/pjdo/2.0.0-M5/mapping-guide/mandatory-properties-in-subtypes.html
index 0745ed9..6cd8c69 100644
--- a/content/pjdo/2.0.0-M5/mapping-guide/mandatory-properties-in-subtypes.html
+++ b/content/pjdo/2.0.0-M5/mapping-guide/mandatory-properties-in-subtypes.html
@@ -463,7 +463,7 @@ public class SomeSubtype extends SomeSuperType {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/mapping-guide/mapping-to-a-view.html b/content/pjdo/2.0.0-M5/mapping-guide/mapping-to-a-view.html
index 1f386ea..b12a54a 100644
--- a/content/pjdo/2.0.0-M5/mapping-guide/mapping-to-a-view.html
+++ b/content/pjdo/2.0.0-M5/mapping-guide/mapping-to-a-view.html
@@ -424,7 +424,7 @@ An <a href="https://github.com/estatio/estatio/blob/b77d0b03ec86463227ba90f83412
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/mapping-guide/one-to-m-bidirectional-relationships.html b/content/pjdo/2.0.0-M5/mapping-guide/one-to-m-bidirectional-relationships.html
index 93683ff..8c2ac6b 100644
--- a/content/pjdo/2.0.0-M5/mapping-guide/one-to-m-bidirectional-relationships.html
+++ b/content/pjdo/2.0.0-M5/mapping-guide/one-to-m-bidirectional-relationships.html
@@ -856,7 +856,7 @@ UPDATE "fvessel"."FermentationVessel"
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjdo/2.0.0-M5/setup-and-configuration.html b/content/pjdo/2.0.0-M5/setup-and-configuration.html
index 50ec996..b6a9d17 100644
--- a/content/pjdo/2.0.0-M5/setup-and-configuration.html
+++ b/content/pjdo/2.0.0-M5/setup-and-configuration.html
@@ -714,7 +714,7 @@ However, with Apache Isis we tend to use annotations instead and externalize con
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/about.html b/content/pjpa/2.0.0-M5/about.html
index 90f5276..4bd8581 100644
--- a/content/pjpa/2.0.0-M5/about.html
+++ b/content/pjpa/2.0.0-M5/about.html
@@ -400,7 +400,7 @@ EclipseLink is the reference implementation for JPA.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/db-schemas.html b/content/pjpa/2.0.0-M5/db-schemas.html
index d8f5a6b..07f078f 100644
--- a/content/pjpa/2.0.0-M5/db-schemas.html
+++ b/content/pjpa/2.0.0-M5/db-schemas.html
@@ -466,7 +466,7 @@ This should be an idempotent command, with the default being SQL-99 compliant:</
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/dependency-injection.html b/content/pjpa/2.0.0-M5/dependency-injection.html
index 8aaf500..baeddd5 100644
--- a/content/pjpa/2.0.0-M5/dependency-injection.html
+++ b/content/pjpa/2.0.0-M5/dependency-injection.html
@@ -408,7 +408,7 @@ public class SomeEntity ... { /* ... */ }</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/domain-services.html b/content/pjpa/2.0.0-M5/domain-services.html
index d7e618c..de7fed7 100644
--- a/content/pjpa/2.0.0-M5/domain-services.html
+++ b/content/pjpa/2.0.0-M5/domain-services.html
@@ -405,7 +405,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/mapping-guide.html b/content/pjpa/2.0.0-M5/mapping-guide.html
index 343384b..e34ffd5 100644
--- a/content/pjpa/2.0.0-M5/mapping-guide.html
+++ b/content/pjpa/2.0.0-M5/mapping-guide.html
@@ -419,7 +419,7 @@ Take a look at:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/setup-and-configuration.html b/content/pjpa/2.0.0-M5/setup-and-configuration.html
index 9234106..5eeccec 100644
--- a/content/pjpa/2.0.0-M5/setup-and-configuration.html
+++ b/content/pjpa/2.0.0-M5/setup-and-configuration.html
@@ -576,7 +576,7 @@ spring.datasource.password=simpleapp</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/pjpa/2.0.0-M5/weaving.html b/content/pjpa/2.0.0-M5/weaving.html
index 95825fa..0d2c7fc 100644
--- a/content/pjpa/2.0.0-M5/weaving.html
+++ b/content/pjpa/2.0.0-M5/weaving.html
@@ -409,7 +409,7 @@ To run, use:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/about.html b/content/refguide/2.0.0-M5/about.html
index b1318e7..62d028d 100644
--- a/content/refguide/2.0.0-M5/about.html
+++ b/content/refguide/2.0.0-M5/about.html
@@ -900,7 +900,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/Column.html b/content/refguide/2.0.0-M5/applib-ant/Column.html
index 602a459..fdf3fa6 100644
--- a/content/refguide/2.0.0-M5/applib-ant/Column.html
+++ b/content/refguide/2.0.0-M5/applib-ant/Column.html
@@ -1075,7 +1075,7 @@ public void setDoc(final Clob doc) { /* ... */ }</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/Digits.html b/content/refguide/2.0.0-M5/applib-ant/Digits.html
index 6092add..e8cf5ad 100644
--- a/content/refguide/2.0.0-M5/applib-ant/Digits.html
+++ b/content/refguide/2.0.0-M5/applib-ant/Digits.html
@@ -918,7 +918,7 @@ public void setCost(final BigDecimal cost) {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/Discriminator.html b/content/refguide/2.0.0-M5/applib-ant/Discriminator.html
index 67bfd87..4128cc3 100644
--- a/content/refguide/2.0.0-M5/applib-ant/Discriminator.html
+++ b/content/refguide/2.0.0-M5/applib-ant/Discriminator.html
@@ -1011,7 +1011,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/NotPersistent.html b/content/refguide/2.0.0-M5/applib-ant/NotPersistent.html
index 4230857..f39dce5 100644
--- a/content/refguide/2.0.0-M5/applib-ant/NotPersistent.html
+++ b/content/refguide/2.0.0-M5/applib-ant/NotPersistent.html
@@ -902,7 +902,7 @@ Therefore ensure that the annotation is placed there.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/Nullable.html b/content/refguide/2.0.0-M5/applib-ant/Nullable.html
index 0746255..7454680 100644
--- a/content/refguide/2.0.0-M5/applib-ant/Nullable.html
+++ b/content/refguide/2.0.0-M5/applib-ant/Nullable.html
@@ -932,7 +932,7 @@ This can also be verified using the <a href="#refguide:mvn:validate.adoc" class=
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/Pattern.html b/content/refguide/2.0.0-M5/applib-ant/Pattern.html
index a149685..2a5c014 100644
--- a/content/refguide/2.0.0-M5/applib-ant/Pattern.html
+++ b/content/refguide/2.0.0-M5/applib-ant/Pattern.html
@@ -929,7 +929,7 @@ private String name;</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/PersistenceCapable.html b/content/refguide/2.0.0-M5/applib-ant/PersistenceCapable.html
index 67cfc37..f621457 100644
--- a/content/refguide/2.0.0-M5/applib-ant/PersistenceCapable.html
+++ b/content/refguide/2.0.0-M5/applib-ant/PersistenceCapable.html
@@ -1039,7 +1039,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/PrimaryKey.html b/content/refguide/2.0.0-M5/applib-ant/PrimaryKey.html
index d7707aa..686f96d 100644
--- a/content/refguide/2.0.0-M5/applib-ant/PrimaryKey.html
+++ b/content/refguide/2.0.0-M5/applib-ant/PrimaryKey.html
@@ -902,7 +902,7 @@ Therefore ensure that the annotation is placed there.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/XmlJavaTypeAdapter.html b/content/refguide/2.0.0-M5/applib-ant/XmlJavaTypeAdapter.html
index 0c9422f..2145bc1 100644
--- a/content/refguide/2.0.0-M5/applib-ant/XmlJavaTypeAdapter.html
+++ b/content/refguide/2.0.0-M5/applib-ant/XmlJavaTypeAdapter.html
@@ -902,7 +902,7 @@ in the user guide.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/XmlRootElement.html b/content/refguide/2.0.0-M5/applib-ant/XmlRootElement.html
index 383023a..7641b2c 100644
--- a/content/refguide/2.0.0-M5/applib-ant/XmlRootElement.html
+++ b/content/refguide/2.0.0-M5/applib-ant/XmlRootElement.html
@@ -981,7 +981,7 @@ public class ToDoItemDto implements Dto {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about.html b/content/refguide/2.0.0-M5/applib-ant/about.html
index 74b73e1..a3a29c1 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about.html
@@ -1365,7 +1365,7 @@ Version</p></td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/hooks/examples.html b/content/refguide/2.0.0-M5/applib-ant/about/hooks/examples.html
index 11623de..379a908 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/hooks/examples.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/hooks/examples.html
@@ -870,7 +870,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/jdo.html b/content/refguide/2.0.0-M5/applib-ant/about/jdo.html
index 06afa96..8873d7b 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/jdo.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/jdo.html
@@ -1005,7 +1005,7 @@ Version</p></td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/jee.html b/content/refguide/2.0.0-M5/applib-ant/about/jee.html
index 6fb7a35..ad5d525 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/jee.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/jee.html
@@ -948,7 +948,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/jpa.html b/content/refguide/2.0.0-M5/applib-ant/about/jpa.html
index c5170ea..c8718c5 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/jpa.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/jpa.html
@@ -878,7 +878,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/main.html b/content/refguide/2.0.0-M5/applib-ant/about/main.html
index cc03ca6..277bd26 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/main.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/main.html
@@ -1012,7 +1012,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/other.html b/content/refguide/2.0.0-M5/applib-ant/about/other.html
index a59ce72..7732811 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/other.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/other.html
@@ -936,7 +936,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-ant/about/partial.html b/content/refguide/2.0.0-M5/applib-ant/about/partial.html
index c238680..d04d7f5 100644
--- a/content/refguide/2.0.0-M5/applib-ant/about/partial.html
+++ b/content/refguide/2.0.0-M5/applib-ant/about/partial.html
@@ -964,7 +964,7 @@ public class ComplexNumber {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/about.html b/content/refguide/2.0.0-M5/applib-classes/about.html
index 9d4f9d3..969db69 100644
--- a/content/refguide/2.0.0-M5/applib-classes/about.html
+++ b/content/refguide/2.0.0-M5/applib-classes/about.html
@@ -879,7 +879,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/events.html b/content/refguide/2.0.0-M5/applib-classes/events.html
index 84ec2c4..8d8feed 100644
--- a/content/refguide/2.0.0-M5/applib-classes/events.html
+++ b/content/refguide/2.0.0-M5/applib-classes/events.html
@@ -1111,7 +1111,7 @@ One use case is to maintain an alternate data store.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/events/domainevent.html b/content/refguide/2.0.0-M5/applib-classes/events/domainevent.html
index bc4dcc7..381419e 100644
--- a/content/refguide/2.0.0-M5/applib-classes/events/domainevent.html
+++ b/content/refguide/2.0.0-M5/applib-classes/events/domainevent.html
@@ -925,7 +925,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/events/lifecycleevent.html b/content/refguide/2.0.0-M5/applib-classes/events/lifecycleevent.html
index c54c59f..eb297f3 100644
--- a/content/refguide/2.0.0-M5/applib-classes/events/lifecycleevent.html
+++ b/content/refguide/2.0.0-M5/applib-classes/events/lifecycleevent.html
@@ -973,7 +973,7 @@ One use case is to maintain an alternate data store.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/events/uievent.html b/content/refguide/2.0.0-M5/applib-classes/events/uievent.html
index 0944321..db055af 100644
--- a/content/refguide/2.0.0-M5/applib-classes/events/uievent.html
+++ b/content/refguide/2.0.0-M5/applib-classes/events/uievent.html
@@ -943,7 +943,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/layout.html b/content/refguide/2.0.0-M5/applib-classes/layout.html
index 1871f97..0b51ec9 100644
--- a/content/refguide/2.0.0-M5/applib-classes/layout.html
+++ b/content/refguide/2.0.0-M5/applib-classes/layout.html
@@ -1178,7 +1178,7 @@ The <a href="../../../vw/2.0.0-M5/about.html" class="page">Web UI (Wicket viewer
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/layout/menubars.html b/content/refguide/2.0.0-M5/applib-classes/layout/menubars.html
index 125bb3e..b6ef69e 100644
--- a/content/refguide/2.0.0-M5/applib-classes/layout/menubars.html
+++ b/content/refguide/2.0.0-M5/applib-classes/layout/menubars.html
@@ -971,7 +971,7 @@ The <a href="../../../../vw/2.0.0-M5/about.html" class="page">Web UI (Wicket vie
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/layout/object-layout.html b/content/refguide/2.0.0-M5/applib-classes/layout/object-layout.html
index fd86a1f..8e7eaba 100644
--- a/content/refguide/2.0.0-M5/applib-classes/layout/object-layout.html
+++ b/content/refguide/2.0.0-M5/applib-classes/layout/object-layout.html
@@ -1088,7 +1088,7 @@ This is always "GET".</td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/mixees-and-mixins.html b/content/refguide/2.0.0-M5/applib-classes/mixees-and-mixins.html
index a0c4e92..8095d27 100644
--- a/content/refguide/2.0.0-M5/applib-classes/mixees-and-mixins.html
+++ b/content/refguide/2.0.0-M5/applib-classes/mixees-and-mixins.html
@@ -1109,7 +1109,7 @@ Rather, these expose callback such that the framework can populate them at the a
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/non-persisted-objects.html b/content/refguide/2.0.0-M5/applib-classes/non-persisted-objects.html
index b69ee57..4e8584e 100644
--- a/content/refguide/2.0.0-M5/applib-classes/non-persisted-objects.html
+++ b/content/refguide/2.0.0-M5/applib-classes/non-persisted-objects.html
@@ -895,7 +895,7 @@ There is a more in-depth discussion on view models in the <a href="../../../user
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/contributee.html b/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/contributee.html
index ce6eec3..56a7000 100644
--- a/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/contributee.html
+++ b/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/contributee.html
@@ -939,7 +939,7 @@ Other services and modules can then contribute actions/collections to render suc
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/mixins.html b/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/mixins.html
index 36f44ec..52a1095 100644
--- a/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/mixins.html
+++ b/content/refguide/2.0.0-M5/applib-classes/roles-mixins-contributees/mixins.html
@@ -994,7 +994,7 @@ Two mixins contribute to this interface:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/spec.html b/content/refguide/2.0.0-M5/applib-classes/spec.html
index 9844aed..00f0dc1 100644
--- a/content/refguide/2.0.0-M5/applib-classes/spec.html
+++ b/content/refguide/2.0.0-M5/applib-classes/spec.html
@@ -1024,7 +1024,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/utility.html b/content/refguide/2.0.0-M5/applib-classes/utility.html
index 1dbc1bd..1ada438 100644
--- a/content/refguide/2.0.0-M5/applib-classes/utility.html
+++ b/content/refguide/2.0.0-M5/applib-classes/utility.html
@@ -905,7 +905,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-classes/value-types.html b/content/refguide/2.0.0-M5/applib-classes/value-types.html
index ce695c4..4cc7e4d 100644
--- a/content/refguide/2.0.0-M5/applib-classes/value-types.html
+++ b/content/refguide/2.0.0-M5/applib-classes/value-types.html
@@ -992,7 +992,7 @@ These can be found in the <a href="../../../valuetypes/2.0.0-M5/about.html" clas
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/about.html b/content/refguide/2.0.0-M5/applib-methods/about.html
index 8a472b7..a3fd39e 100644
--- a/content/refguide/2.0.0-M5/applib-methods/about.html
+++ b/content/refguide/2.0.0-M5/applib-methods/about.html
@@ -883,7 +883,7 @@ It also documents the reserved methods that act as callback hooks into the persi
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle.html
index 5bb227b..472d026 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle.html
@@ -1078,7 +1078,7 @@ That&#8217;s because its not valid to interact with a persistent domain object o
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/created.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/created.html
index 2f08fba..94a64b6 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/created.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/created.html
@@ -897,7 +897,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/loaded.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/loaded.html
index 83c3854..7a00221 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/loaded.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/loaded.html
@@ -880,7 +880,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisted.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisted.html
index 51b7208..eae1eec 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisted.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisted.html
@@ -883,7 +883,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisting.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisting.html
index 7ec177e..3c80e5d 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisting.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/persisting.html
@@ -883,7 +883,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/removing.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/removing.html
index 9d55fa9..0e09845 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/removing.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/removing.html
@@ -894,7 +894,7 @@ That&#8217;s because its not valid to interact with a persistent domain object o
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/updated.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/updated.html
index 8cec97f..991d86e 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/updated.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/updated.html
@@ -883,7 +883,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/lifecycle/updating.html b/content/refguide/2.0.0-M5/applib-methods/lifecycle/updating.html
index 07e3abb..6ecefe9 100644
--- a/content/refguide/2.0.0-M5/applib-methods/lifecycle/updating.html
+++ b/content/refguide/2.0.0-M5/applib-methods/lifecycle/updating.html
@@ -883,7 +883,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes.html b/content/refguide/2.0.0-M5/applib-methods/prefixes.html
index 385f013..289f0cb 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes.html
@@ -1828,7 +1828,7 @@ TODO: v2 - need to document
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/autoComplete.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/autoComplete.html
index 4a1841a..dd2d03d 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/autoComplete.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/autoComplete.html
@@ -1005,7 +1005,7 @@ public class ShoppingCartItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/choices.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/choices.html
index aec85d5..e5ccaa4 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/choices.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/choices.html
@@ -1051,7 +1051,7 @@ public class ShoppingCartItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/default.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/default.html
index 905d014..6f5b59f 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/default.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/default.html
@@ -1073,7 +1073,7 @@ However, this cannot use any injected services as they will not have been initia
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/disable.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/disable.html
index 85c5b4a..5437c42 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/disable.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/disable.html
@@ -996,7 +996,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/get.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/get.html
index 4c37324..60071d4 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/get.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/get.html
@@ -889,7 +889,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/hide.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/hide.html
index 4957bb8..6211632 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/hide.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/hide.html
@@ -984,7 +984,7 @@ However, if they check the first boolean parameter (ie, to ship the <code>Order<
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/set.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/set.html
index e492098..a9f3d00 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/set.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/set.html
@@ -880,7 +880,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/prefixes/validate.html b/content/refguide/2.0.0-M5/applib-methods/prefixes/validate.html
index 401f8cb..35b238a 100644
--- a/content/refguide/2.0.0-M5/applib-methods/prefixes/validate.html
+++ b/content/refguide/2.0.0-M5/applib-methods/prefixes/validate.html
@@ -889,7 +889,7 @@ TODO: v2 - need to document
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/ui-hints.html b/content/refguide/2.0.0-M5/applib-methods/ui-hints.html
index 8565d7c..c70edd2 100644
--- a/content/refguide/2.0.0-M5/applib-methods/ui-hints.html
+++ b/content/refguide/2.0.0-M5/applib-methods/ui-hints.html
@@ -1138,7 +1138,7 @@ The signature of this method is usually:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/ui-hints/cssClass.html b/content/refguide/2.0.0-M5/applib-methods/ui-hints/cssClass.html
index 9b36546..8c64bc5 100644
--- a/content/refguide/2.0.0-M5/applib-methods/ui-hints/cssClass.html
+++ b/content/refguide/2.0.0-M5/applib-methods/ui-hints/cssClass.html
@@ -919,7 +919,7 @@ tr.done {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/ui-hints/iconName.html b/content/refguide/2.0.0-M5/applib-methods/ui-hints/iconName.html
index 5dcc44f..0fa876c 100644
--- a/content/refguide/2.0.0-M5/applib-methods/ui-hints/iconName.html
+++ b/content/refguide/2.0.0-M5/applib-methods/ui-hints/iconName.html
@@ -914,7 +914,7 @@ The value returned by the <code>iconName()</code> method is added as a suffix to
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/ui-hints/layout.html b/content/refguide/2.0.0-M5/applib-methods/ui-hints/layout.html
index 9e9055e..da41d2a 100644
--- a/content/refguide/2.0.0-M5/applib-methods/ui-hints/layout.html
+++ b/content/refguide/2.0.0-M5/applib-methods/ui-hints/layout.html
@@ -921,7 +921,7 @@ This may be specified using annotations such as <a href="../../applib/index/anno
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-methods/ui-hints/title.html b/content/refguide/2.0.0-M5/applib-methods/ui-hints/title.html
index f3aeb67..50e9769 100644
--- a/content/refguide/2.0.0-M5/applib-methods/ui-hints/title.html
+++ b/content/refguide/2.0.0-M5/applib-methods/ui-hints/title.html
@@ -934,7 +934,7 @@ The signature of this method is usually:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib-svc/about.html b/content/refguide/2.0.0-M5/applib-svc/about.html
index 9e7d17f..e270118 100644
--- a/content/refguide/2.0.0-M5/applib-svc/about.html
+++ b/content/refguide/2.0.0-M5/applib-svc/about.html
@@ -1853,7 +1853,7 @@ The framework provides a default <code>PublisherServiceLogging</code> implementa
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg b/content/refguide/2.0.0-M5/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg
index 4d128dd..b10fbc6 100644
--- a/content/refguide/2.0.0-M5/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg
+++ b/content/refguide/2.0.0-M5/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="57px" preserveAspectRatio="none" style="width:345px;height:57px;" version="1.1" viewBox="0 0 345 57" width="345px" zoomAndPan="magnify"><defs><filter height="300%" id="f1kwq0jmnpvosg" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatr [...]
-class Party--><rect codeLine="3" fill="#FEFECE" filter="url(#f1kwq0jmnpvosg)" height="32" id="Party" style="stroke:#A80036;stroke-width:1.5;" width="58" x="7" y="11.1842"/><ellipse cx="22" cy="27.1842" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M17.9375,27.3248 Q17.9375,23.8717 19.0313,22.2467 Q20.1406,20.6061 22.3594,20.6061 Q23.5625,20.6061 24.8281,21.2623 L24.8281,23.3092 Q23.375,22.5279 22.4375,22.5279 Q19.9844,22.5279 19.9844,27.3248 Q19.9844,3 [...]
-class AgreementRole--><rect codeLine="4" fill="#FEFECE" filter="url(#f1kwq0jmnpvosg)" height="32" id="AgreementRole" style="stroke:#A80036;stroke-width:1.5;" width="109" x="100.5" y="11.1842"/><ellipse cx="115.5" cy="27.1842" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M111.4375,27.3248 Q111.4375,23.8717 112.5313,22.2467 Q113.6406,20.6061 115.8594,20.6061 Q117.0625,20.6061 118.3281,21.2623 L118.3281,23.3092 Q116.875,22.5279 115.9375,22.5279 Q113.4844 [...]
-class Agreement--><rect codeLine="5" fill="#FEFECE" filter="url(#f1kwq0jmnpvosg)" height="32" id="Agreement" style="stroke:#A80036;stroke-width:1.5;" width="87" x="244.5" y="11.1842"/><ellipse cx="259.5" cy="27.1842" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M255.4375,27.3248 Q255.4375,23.8717 256.5313,22.2467 Q257.6406,20.6061 259.8594,20.6061 Q261.0625,20.6061 262.3281,21.2623 L262.3281,23.3092 Q260.875,22.5279 259.9375,22.5279 Q257.4844,22.5279  [...]
-link Party to AgreementRole--><path codeLine="7" d="M70.49,27.1842 C78.73,27.1842 86.96,27.1842 95.2,27.1842 " fill="none" id="Party-AgreementRole" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="100.33,27.1842,91.33,23.1842,95.33,27.1842,91.33,31.1842,100.33,27.1842" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="65.29,27.1842,74.29,31.1842,70.29,27.1842,74.29,23.1842,65.29,27.1842" style="stroke:#A80036;stroke-width:1.0;"/><text fill [...]
-link AgreementRole to Agreement--><path codeLine="8" d="M214.74,27.1842 C222.95,27.1842 231.16,27.1842 239.37,27.1842 " fill="none" id="AgreementRole-Agreement" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="244.49,27.1842,235.49,23.1842,239.49,27.1842,235.49,31.1842,244.49,27.1842" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="209.55,27.1842,218.55,31.1842,214.55,27.1842,218.55,23.1842,209.55,27.1842" style="stroke:#A80036;stroke-wi [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="53px" preserveAspectRatio="none" style="width:351px;height:53px;" version="1.1" viewBox="0 0 351 53" width="351px" zoomAndPan="magnify"><defs><filter height="300%" id="f1kwq0jmnpvosg" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatr [...]
+class Party--><rect codeLine="3" fill="#FEFECE" filter="url(#f1kwq0jmnpvosg)" height="32" id="Party" style="stroke:#A80036;stroke-width:1.5;" width="60" x="7" y="7.0225"/><ellipse cx="22" cy="23.0225" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M21.3594,26.8038 Q22.1563,26.8038 22.7188,26.6163 Q23.2969,26.4131 23.5313,26.1944 Q23.7813,25.96 24.0156,25.7725 Q24.2656,25.5694 24.4844,25.5694 Q24.8281,25.5694 25.0781,25.835 Q25.3438,26.085 25.3438,26.413 [...]
+class AgreementRole--><rect codeLine="4" fill="#FEFECE" filter="url(#f1kwq0jmnpvosg)" height="32" id="AgreementRole" style="stroke:#A80036;stroke-width:1.5;" width="112" x="102" y="7.0225"/><ellipse cx="117" cy="23.0225" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M116.3594,26.8038 Q117.1563,26.8038 117.7188,26.6163 Q118.2969,26.4131 118.5313,26.1944 Q118.7813,25.96 119.0156,25.7725 Q119.2656,25.5694 119.4844,25.5694 Q119.8281,25.5694 120.0781,25.835 [...]
+class Agreement--><rect codeLine="5" fill="#FEFECE" filter="url(#f1kwq0jmnpvosg)" height="32" id="Agreement" style="stroke:#A80036;stroke-width:1.5;" width="88" x="249" y="7.0225"/><ellipse cx="264" cy="23.0225" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M263.3594,26.8038 Q264.1563,26.8038 264.7188,26.6163 Q265.2969,26.4131 265.5313,26.1944 Q265.7813,25.96 266.0156,25.7725 Q266.2656,25.5694 266.4844,25.5694 Q266.8281,25.5694 267.0781,25.835 Q267.343 [...]
+link Party to AgreementRole--><path codeLine="7" d="M72.41,23.0225 C80.57,23.0225 88.74,23.0225 96.91,23.0225 " fill="none" id="Party-AgreementRole" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="101.99,23.0225,92.99,19.0225,96.99,23.0225,92.99,27.0225,101.99,23.0225" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="67.25,23.0225,76.25,27.0225,72.25,23.0225,76.25,19.0225,67.25,23.0225" style="stroke:#A80036;stroke-width:1.0;"/><text fil [...]
+link AgreementRole to Agreement--><path codeLine="8" d="M219.33,23.0225 C227.51,23.0225 235.69,23.0225 243.87,23.0225 " fill="none" id="AgreementRole-Agreement" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="248.96,23.0225,239.96,19.0225,243.96,23.0225,239.96,27.0225,248.96,23.0225" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="214.16,23.0225,223.16,27.0225,219.16,23.0225,223.16,19.0225,214.16,23.0225" style="stroke:#A80036;stroke-wi [...]
 @startuml
 hide empty members
 
@@ -15,7 +15,7 @@ Party <-r-> "0.*" AgreementRole
 AgreementRole "0..*" <-r-> Agreement
 @enduml
 
-PlantUML version 1.2021.01(Tue Feb 02 07:55:08 GMT 2021)
+PlantUML version 1.2021.4(Sun Apr 04 08:49:39 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/refguide/2.0.0-M5/applib/index/AbstractViewModel.html b/content/refguide/2.0.0-M5/applib/index/AbstractViewModel.html
index 6446346..368847e 100644
--- a/content/refguide/2.0.0-M5/applib/index/AbstractViewModel.html
+++ b/content/refguide/2.0.0-M5/applib/index/AbstractViewModel.html
@@ -896,7 +896,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/Identifier.html b/content/refguide/2.0.0-M5/applib/index/Identifier.html
index 168a6c5..e8779a7 100644
--- a/content/refguide/2.0.0-M5/applib/index/Identifier.html
+++ b/content/refguide/2.0.0-M5/applib/index/Identifier.html
@@ -909,7 +909,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/IsisModuleApplib.html b/content/refguide/2.0.0-M5/applib/index/IsisModuleApplib.html
index b19336b..c2a5471 100644
--- a/content/refguide/2.0.0-M5/applib/index/IsisModuleApplib.html
+++ b/content/refguide/2.0.0-M5/applib/index/IsisModuleApplib.html
@@ -886,7 +886,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/RecreatableDomainObject.html b/content/refguide/2.0.0-M5/applib/index/RecreatableDomainObject.html
index 07aeae1..33853bd 100644
--- a/content/refguide/2.0.0-M5/applib/index/RecreatableDomainObject.html
+++ b/content/refguide/2.0.0-M5/applib/index/RecreatableDomainObject.html
@@ -951,7 +951,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/ViewModel.html b/content/refguide/2.0.0-M5/applib/index/ViewModel.html
index e9569a6..1ce7f73 100644
--- a/content/refguide/2.0.0-M5/applib/index/ViewModel.html
+++ b/content/refguide/2.0.0-M5/applib/index/ViewModel.html
@@ -951,7 +951,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/AbstractValueSemanticsProvider.html b/content/refguide/2.0.0-M5/applib/index/adapters/AbstractValueSemanticsProvider.html
index 7de7b4a..d1c1515 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/AbstractValueSemanticsProvider.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/AbstractValueSemanticsProvider.html
@@ -889,7 +889,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/DefaultsProvider.html b/content/refguide/2.0.0-M5/applib/index/adapters/DefaultsProvider.html
index 2646dfe..5cb8669 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/DefaultsProvider.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/DefaultsProvider.html
@@ -933,7 +933,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/EncoderDecoder.html b/content/refguide/2.0.0-M5/applib/index/adapters/EncoderDecoder.html
index bc667ab..0b411b5 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/EncoderDecoder.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/EncoderDecoder.html
@@ -957,7 +957,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/EncodingException.html b/content/refguide/2.0.0-M5/applib/index/adapters/EncodingException.html
index d6331df..dfc9fd0 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/EncodingException.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/EncodingException.html
@@ -897,7 +897,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/Parser.html b/content/refguide/2.0.0-M5/applib/index/adapters/Parser.html
index 2eaec8f..5344c1f 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/Parser.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/Parser.html
@@ -1051,7 +1051,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/ParsingException.html b/content/refguide/2.0.0-M5/applib/index/adapters/ParsingException.html
index 9356ba9..28c32d4 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/ParsingException.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/ParsingException.html
@@ -897,7 +897,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/adapters/ValueSemanticsProvider.html b/content/refguide/2.0.0-M5/applib/index/adapters/ValueSemanticsProvider.html
index 261f11f..4b32a2f 100644
--- a/content/refguide/2.0.0-M5/applib/index/adapters/ValueSemanticsProvider.html
+++ b/content/refguide/2.0.0-M5/applib/index/adapters/ValueSemanticsProvider.html
@@ -965,7 +965,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Action.html b/content/refguide/2.0.0-M5/applib/index/annotation/Action.html
index 7d19799..d6e5ab3 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Action.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Action.html
@@ -1999,7 +1999,7 @@ The effect is to ignore it for replay purposes:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/ActionLayout.html b/content/refguide/2.0.0-M5/applib/index/annotation/ActionLayout.html
index 21c6a36..0583584 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/ActionLayout.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/ActionLayout.html
@@ -1671,7 +1671,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/BookmarkPolicy.html b/content/refguide/2.0.0-M5/applib/index/annotation/BookmarkPolicy.html
index 348cee9..cc2aa7d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/BookmarkPolicy.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/BookmarkPolicy.html
@@ -967,7 +967,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Bounding.html b/content/refguide/2.0.0-M5/applib/index/annotation/Bounding.html
index 41e97cf..29f7c1b 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Bounding.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Bounding.html
@@ -896,7 +896,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Collection.html b/content/refguide/2.0.0-M5/applib/index/annotation/Collection.html
index 90293a1..4f773a5 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Collection.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Collection.html
@@ -1399,7 +1399,7 @@ public void Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/CollectionLayout.html b/content/refguide/2.0.0-M5/applib/index/annotation/CollectionLayout.html
index f4df748..0500201 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/CollectionLayout.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/CollectionLayout.html
@@ -1434,7 +1434,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Defaulted.html b/content/refguide/2.0.0-M5/applib/index/annotation/Defaulted.html
index 5568722..f094c11 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Defaulted.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Defaulted.html
@@ -950,7 +950,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/DomainObject.html b/content/refguide/2.0.0-M5/applib/index/annotation/DomainObject.html
index 45c1bc8..35bb3ba 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/DomainObject.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/DomainObject.html
@@ -2728,7 +2728,7 @@ Alternatively, when using <a href="Action.html" class="page">@Action</a> then me
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/DomainObjectLayout.html b/content/refguide/2.0.0-M5/applib/index/annotation/DomainObjectLayout.html
index e40b83b..e3e959b 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/DomainObjectLayout.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/DomainObjectLayout.html
@@ -1682,7 +1682,7 @@ public class SomeSubscriber {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/DomainService.html b/content/refguide/2.0.0-M5/applib/index/annotation/DomainService.html
index bab8788..15ec5de 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/DomainService.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/DomainService.html
@@ -1122,7 +1122,7 @@ public class LoanRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout.html b/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout.html
index dee8d9b..76573b8 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout.html
@@ -1027,7 +1027,7 @@ public class CustomerRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout~MenuBar.html b/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout~MenuBar.html
index ea486a5..c1e8625 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout~MenuBar.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/DomainServiceLayout~MenuBar.html
@@ -897,7 +897,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Editing.html b/content/refguide/2.0.0-M5/applib/index/annotation/Editing.html
index 1aaba4f..25ca94e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Editing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Editing.html
@@ -977,7 +977,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/EntityChangeKind.html b/content/refguide/2.0.0-M5/applib/index/annotation/EntityChangeKind.html
index 453288a..f151b5d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/EntityChangeKind.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/EntityChangeKind.html
@@ -889,7 +889,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/EqualByContent.html b/content/refguide/2.0.0-M5/applib/index/annotation/EqualByContent.html
index 54dc394..06ade1e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/EqualByContent.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/EqualByContent.html
@@ -902,7 +902,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Facets.html b/content/refguide/2.0.0-M5/applib/index/annotation/Facets.html
index d6f583c..2363388 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Facets.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Facets.html
@@ -950,7 +950,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/HomePage.html b/content/refguide/2.0.0-M5/applib/index/annotation/HomePage.html
index afd592b..62f1e3c 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/HomePage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/HomePage.html
@@ -940,7 +940,7 @@ public class TodoAppDashboard {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/InteractionScope.html b/content/refguide/2.0.0-M5/applib/index/annotation/InteractionScope.html
index bac9493..e9377c5 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/InteractionScope.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/InteractionScope.html
@@ -902,7 +902,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/LabelPosition.html b/content/refguide/2.0.0-M5/applib/index/annotation/LabelPosition.html
index 0a35bd0..597111e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/LabelPosition.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/LabelPosition.html
@@ -942,7 +942,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/MemberOrder.html b/content/refguide/2.0.0-M5/applib/index/annotation/MemberOrder.html
index 6426704..bd5b525 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/MemberOrder.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/MemberOrder.html
@@ -1083,7 +1083,7 @@ For actions associated with properties, the <a href="ActionLayout.html#position"
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/MinLength.html b/content/refguide/2.0.0-M5/applib/index/annotation/MinLength.html
index 47ed67d..c511da6 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/MinLength.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/MinLength.html
@@ -897,7 +897,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Module.html b/content/refguide/2.0.0-M5/applib/index/annotation/Module.html
index e0da73c..f5d3b25 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Module.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Module.html
@@ -899,7 +899,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Nature.html b/content/refguide/2.0.0-M5/applib/index/annotation/Nature.html
index 7e0de75..9bdce96 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Nature.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Nature.html
@@ -1005,7 +1005,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/NatureOfService.html b/content/refguide/2.0.0-M5/applib/index/annotation/NatureOfService.html
index 95f3e87..814c5d0 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/NatureOfService.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/NatureOfService.html
@@ -974,7 +974,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Navigable.html b/content/refguide/2.0.0-M5/applib/index/annotation/Navigable.html
index 3a5601f..06810d8 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Navigable.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Navigable.html
@@ -897,7 +897,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Optionality.html b/content/refguide/2.0.0-M5/applib/index/annotation/Optionality.html
index 363ef61..9b5a394 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Optionality.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Optionality.html
@@ -983,7 +983,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/OrderPrecedence.html b/content/refguide/2.0.0-M5/applib/index/annotation/OrderPrecedence.html
index a132455..3bf5fd4 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/OrderPrecedence.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/OrderPrecedence.html
@@ -985,7 +985,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Parameter.html b/content/refguide/2.0.0-M5/applib/index/annotation/Parameter.html
index b868587..8c6eff0 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Parameter.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Parameter.html
@@ -1349,7 +1349,7 @@ or <a href="../../../applib-classes/value-types.html#Clob" class="page">Clob</a>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/ParameterLayout.html b/content/refguide/2.0.0-M5/applib/index/annotation/ParameterLayout.html
index a2f20eb..03e1e45 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/ParameterLayout.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/ParameterLayout.html
@@ -1412,7 +1412,7 @@ All that said, the <a href="../../../../../vw/2.0.0-M5/about.html" class="page">
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Programmatic.html b/content/refguide/2.0.0-M5/applib/index/annotation/Programmatic.html
index 8673ba9..6216fca 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Programmatic.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Programmatic.html
@@ -926,7 +926,7 @@ For example:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Projecting.html b/content/refguide/2.0.0-M5/applib/index/annotation/Projecting.html
index efc4323..5e8141b 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Projecting.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Projecting.html
@@ -931,7 +931,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/PromptStyle.html b/content/refguide/2.0.0-M5/applib/index/annotation/PromptStyle.html
index 0b1bcc9..0a8a0ab 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/PromptStyle.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/PromptStyle.html
@@ -1054,7 +1054,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Property.html b/content/refguide/2.0.0-M5/applib/index/annotation/Property.html
index 3372b2d..ba6fced 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Property.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Property.html
@@ -2434,7 +2434,7 @@ Annotating with <code>@Property(where=Where.NOWHERE)</code> overrides this.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/PropertyLayout.html b/content/refguide/2.0.0-M5/applib/index/annotation/PropertyLayout.html
index 978f479..9a0c2b7 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/PropertyLayout.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/PropertyLayout.html
@@ -1736,7 +1736,7 @@ All that said, the <a href="../../../../../vw/2.0.0-M5/about.html" class="page">
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Publishing.html b/content/refguide/2.0.0-M5/applib/index/annotation/Publishing.html
index 8163692..ef047c1 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Publishing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Publishing.html
@@ -1009,7 +1009,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Redirect.html b/content/refguide/2.0.0-M5/applib/index/annotation/Redirect.html
index 051d216..377d91c 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Redirect.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Redirect.html
@@ -959,7 +959,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/RenderDay.html b/content/refguide/2.0.0-M5/applib/index/annotation/RenderDay.html
index 47b766b..1fa11ee 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/RenderDay.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/RenderDay.html
@@ -939,7 +939,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Repainting.html b/content/refguide/2.0.0-M5/applib/index/annotation/Repainting.html
index bbab9c0..aa2da23 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Repainting.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Repainting.html
@@ -939,7 +939,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/RestrictTo.html b/content/refguide/2.0.0-M5/applib/index/annotation/RestrictTo.html
index ae2447b..66ec9cb 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/RestrictTo.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/RestrictTo.html
@@ -896,7 +896,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/SemanticsOf.html b/content/refguide/2.0.0-M5/applib/index/annotation/SemanticsOf.html
index 8cee68a..09909a0 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/SemanticsOf.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/SemanticsOf.html
@@ -1205,7 +1205,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Snapshot.html b/content/refguide/2.0.0-M5/applib/index/annotation/Snapshot.html
index 76f8759..818be9d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Snapshot.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Snapshot.html
@@ -956,7 +956,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Title.html b/content/refguide/2.0.0-M5/applib/index/annotation/Title.html
index 0cece97..a73def1 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Title.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Title.html
@@ -1050,7 +1050,7 @@ This convention can be overridden using <code>@Property(where=Where.NOWHERE)</co
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Value.html b/content/refguide/2.0.0-M5/applib/index/annotation/Value.html
index 459e1f9..6d9f47b 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Value.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Value.html
@@ -976,7 +976,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/Where.html b/content/refguide/2.0.0-M5/applib/index/annotation/Where.html
index c5391a7..eb73f88 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/Where.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/Where.html
@@ -1139,7 +1139,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html
index 713d5c6..941c9f7 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html
@@ -929,7 +929,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html
index d57d42d..053e979 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html
@@ -957,7 +957,7 @@ The net effect is that a property conceptually consisting of different parts (eg
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_022-position.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_022-position.html
index 5bc42b7..421bf7d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_022-position.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_022-position.html
@@ -949,7 +949,7 @@ If the <code>PANEL</code> or <code>PANEL_DROPDOWN</code> are used, then (as the
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_023-describedAs.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_023-describedAs.html
index c63e0bd..b875290 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_023-describedAs.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_023-describedAs.html
@@ -888,7 +888,7 @@ In the <a href="../../../../../../vw/2.0.0-M5/about.html" class="page">Web UI (W
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_024-cssClass.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_024-cssClass.html
index 2819299..64e1782 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_024-cssClass.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_024-cssClass.html
@@ -902,7 +902,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html
index dff5c7a..82f71f0 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html
@@ -908,7 +908,7 @@ The <code>fa-</code> prefix can also be omitted from the class names; it will be
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html
index 6d2d43f..30a70ce 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html
@@ -924,7 +924,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_027-hidden.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_027-hidden.html
index c5e5a83..84af75d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_027-hidden.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_027-hidden.html
@@ -926,7 +926,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_028-named.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_028-named.html
index f39b1e2..0a57f63 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_028-named.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_028-named.html
@@ -917,7 +917,7 @@ Examples of that include a name that would be a reserved Java keyword (eg "packa
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_029-redirect.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_029-redirect.html
index bdb4df7..67a7021 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_029-redirect.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ActionLayout_029-redirect.html
@@ -955,7 +955,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_010-examples-and-usage.html
index 4907fdb..a7d64bd 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_010-examples-and-usage.html
@@ -916,7 +916,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_021-associating.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_021-associating.html
index fc6d50d..fd7f12c 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_021-associating.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_021-associating.html
@@ -945,7 +945,7 @@ The optional <code>associateWithSequence</code> element specifies the order of t
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_022-action-semantics.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_022-action-semantics.html
index 08bf64a..26b17a8 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_022-action-semantics.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_022-action-semantics.html
@@ -962,7 +962,7 @@ Note though that the results of this caching will only be apparent if the action
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_023-deployment-modes.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_023-deployment-modes.html
index 3838b95..94d9a5f 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_023-deployment-modes.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_023-deployment-modes.html
@@ -912,7 +912,7 @@ However, it would be useful to disaply how for a test or demo system where there
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_024-domain-events.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_024-domain-events.html
index 566b46f..361513e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_024-domain-events.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_024-domain-events.html
@@ -1110,7 +1110,7 @@ However, events can be raised programmatically either by calling the <a href="..
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_025-execution-publishing.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_025-execution-publishing.html
index c65283b..b194fdb 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_025-execution-publishing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_025-execution-publishing.html
@@ -930,7 +930,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_026-command-processing.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_026-command-processing.html
index 447e8cd..1fb0b3f 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_026-command-processing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_026-command-processing.html
@@ -1065,7 +1065,7 @@ The effect is to ignore it for replay purposes:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_027-collection-types.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_027-collection-types.html
index 53f54f6..fca2172 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_027-collection-types.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_027-collection-types.html
@@ -895,7 +895,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_030-see-also.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_030-see-also.html
index 2c2f0cc..dc29c09 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_030-see-also.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Action_030-see-also.html
@@ -924,7 +924,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html
index a75912e..19e6735 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html
@@ -929,7 +929,7 @@ This is specifically so that boilerplate-busting tools such as <a href="https://
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html
index 2a4eebe..a9c6809 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html
@@ -906,7 +906,7 @@ This attribute can be used to select any of these alternative views instead.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_022-paged.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_022-paged.html
index 8de4647..23bd239 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_022-paged.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_022-paged.html
@@ -912,7 +912,7 @@ public class Order {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html
index 07ac5bb..6608e04 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html
@@ -895,7 +895,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html
index 9b01d11..e7c2caf 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html
@@ -920,7 +920,7 @@ public class ToDoItem implements Comparable&lt;ToDoItem&gt; {         <i class="
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html
index 2f8a730..3ccb2d3 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html
@@ -895,7 +895,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_026-named.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_026-named.html
index 3902b18..efdcad7 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_026-named.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_026-named.html
@@ -919,7 +919,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_027-hidden.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_027-hidden.html
index 47fd39e..166df93 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_027-hidden.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/CollectionLayout_027-hidden.html
@@ -933,7 +933,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_010-examples-and-usage.html
index e4d7105..91da4a1 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_010-examples-and-usage.html
@@ -935,7 +935,7 @@ This is so that boilerplate-busting tools such as <a href="https://projectlombok
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_021_domainEvent.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_021_domainEvent.html
index bb28b11..ca4e0b9 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_021_domainEvent.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_021_domainEvent.html
@@ -1120,7 +1120,7 @@ However, events can be raised programmatically either by calling the <a href="..
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_022_hidden.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_022_hidden.html
index 25a16a2..c0b3344 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_022_hidden.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_022_hidden.html
@@ -933,7 +933,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_023_typeOf.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_023_typeOf.html
index 526eb7c..1c10934 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_023_typeOf.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Collection_023_typeOf.html
@@ -907,7 +907,7 @@ public void Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html
index a036a8c..4f50f1f 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html
@@ -912,7 +912,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html
index 1b0b9df..111141b 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html
@@ -891,7 +891,7 @@ public class ProspectiveSale {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html
index 4264b85..1f50431 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html
@@ -902,7 +902,7 @@ public class ToDoItem { /* ... */ }</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html
index fb7cb7a..b08b06b 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html
@@ -913,7 +913,7 @@ The <code>fa-</code> prefix can also be omitted from the class names; it will be
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_024-named.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_024-named.html
index 1f029af..668e5e2 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_024-named.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_024-named.html
@@ -930,7 +930,7 @@ public class Child {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html
index 539a6c8..71dd984 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html
@@ -929,7 +929,7 @@ public abstract class Unit {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html
index b4618bd..ccae386 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html
@@ -907,7 +907,7 @@ public class Order {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html
index e43a21e..85add8c 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html
@@ -1106,7 +1106,7 @@ public class SomeSubscriber {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html
index 9dbbc57..babd1aa 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html
@@ -978,7 +978,7 @@ If you are using view models heavily, you may wish to restrict yourself to just
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_021-objectType.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_021-objectType.html
index b656216..392bb6d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_021-objectType.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_021-objectType.html
@@ -974,7 +974,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_022-nature.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_022-nature.html
index 701643b..522bfc4 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_022-nature.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_022-nature.html
@@ -987,7 +987,7 @@ If you are using view models heavily, you may wish to restrict yourself to just
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_023-editing.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_023-editing.html
index b587124..3e27c40 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_023-editing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_023-editing.html
@@ -937,7 +937,7 @@ public class Country {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_024-domain-events.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_024-domain-events.html
index d03c4de..a9e4bcc 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_024-domain-events.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_024-domain-events.html
@@ -1131,7 +1131,7 @@ Even easier, <code>event#getSubject()</code> will always return the domain objec
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html
index a1c4684..cef69d8 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html
@@ -1278,7 +1278,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html
index 96c6867..3bf3bf1 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html
@@ -921,7 +921,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_027-bounding.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_027-bounding.html
index cd12ebe..a1b5444 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_027-bounding.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_027-bounding.html
@@ -918,7 +918,7 @@ However, if there is no realistic upper bound to the number of instances of an e
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html
index a376a36..c2e82fa 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html
@@ -997,7 +997,7 @@ public class Customers {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html
index da919b8..c7ab526 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html
@@ -935,7 +935,7 @@ Alternatively, when using <a href="../Action.html" class="page">@Action</a> then
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_040-see-also.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_040-see-also.html
index 7d67600..1ff2683 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_040-see-also.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainObject_040-see-also.html
@@ -890,7 +890,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html
index 5e288ec..8bfdba4 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html
@@ -875,7 +875,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html
index da185f9..18c290e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html
@@ -924,7 +924,7 @@ The <a href="../../../../../../vro/2.0.0-M5/about.html" class="page">RestfulObje
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_022-named.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_022-named.html
index bd2ef09..ec38fe1 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_022-named.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainServiceLayout_022-named.html
@@ -889,7 +889,7 @@ public class CustomerRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html
index 38fb997..e691101 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html
@@ -875,7 +875,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_021-objectType.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_021-objectType.html
index 972e717..e2caad9 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_021-objectType.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_021-objectType.html
@@ -968,7 +968,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_022-nature.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_022-nature.html
index 495c678..c09e910 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_022-nature.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/DomainService_022-nature.html
@@ -940,7 +940,7 @@ public class LoanRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Facets_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Facets_010-examples-and-usage.html
index ea196e2..5acfd0d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Facets_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Facets_010-examples-and-usage.html
@@ -870,7 +870,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html
index 97e83d5..3c7add3 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html
@@ -910,7 +910,7 @@ public class TodoAppDashboard {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html
index ceabd2f..5c0a86a 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html
@@ -870,7 +870,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MemberOrder_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MemberOrder_010-examples-and-usage.html
index 8a7ea4e..8af99eb 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MemberOrder_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MemberOrder_010-examples-and-usage.html
@@ -992,7 +992,7 @@ For actions associated with properties, the <a href="../ActionLayout.html#positi
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html
index 4ed5839..4791826 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html
@@ -870,7 +870,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html
index 9a22648..fb0c13f 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html
@@ -916,7 +916,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html
index 8b6731c..134eef4 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html
@@ -934,7 +934,7 @@ At the time of writing, this means labels are to the left for all datatypes exce
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html
index da68ba9..e9a64cc 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html
@@ -898,7 +898,7 @@ It is ignored for other parameter types.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html
index 3facb3c..5e6092e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html
@@ -898,7 +898,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html
index 657ecdc..4066f88 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html
@@ -895,7 +895,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html
index 5a9ec6d..6160566 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html
@@ -906,7 +906,7 @@ In such cases there would typically be <code>startDate</code> and <code>endDate<
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_026-named.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_026-named.html
index abc5347..566a095 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_026-named.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_026-named.html
@@ -922,7 +922,7 @@ To allow HTML markup, set the related <a href="../ParameterLayout.html#namedEsca
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html
index 866bdc4..599dbb3 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html
@@ -916,7 +916,7 @@ All that said, the <a href="../../../../../../vw/2.0.0-M5/about.html" class="pag
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html
index f3490cf..735b253 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html
@@ -915,7 +915,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_021-optionality.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_021-optionality.html
index 616eec7..f4d81bc 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_021-optionality.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_021-optionality.html
@@ -917,7 +917,7 @@ If optionality is required, then use the corresponding wrapper class (e.g. <code
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_022-maxLength.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_022-maxLength.html
index c33686e..a00b668 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_022-maxLength.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_022-maxLength.html
@@ -892,7 +892,7 @@ It is ignored if applied to parameters of any other type.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html
index 677a5d2..2a9548d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html
@@ -970,7 +970,7 @@ This defines the API:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_024-regexPattern.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_024-regexPattern.html
index 9a5a153..90ddbce 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_024-regexPattern.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_024-regexPattern.html
@@ -920,7 +920,7 @@ The values are those that would normally be passed to <code>java.util.regex.Patt
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_025-fileAccept.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_025-fileAccept.html
index ee15a77..30aa68d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_025-fileAccept.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Parameter_025-fileAccept.html
@@ -901,7 +901,7 @@ or <a href="../../../../applib-classes/value-types.html#Clob" class="page">Clob<
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html
index 9b7c2b4..69c3ba4 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html
@@ -893,7 +893,7 @@ For example:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html
index 86dd7fb..cc17983 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html
@@ -930,7 +930,7 @@ so that boilerplate-busting tools such as <a href="https://projectlombok.org/">P
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html
index 325a8e1..9c3ec7d 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html
@@ -933,7 +933,7 @@ At the time of writing, this means labels are to the left for all datatypes exce
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html
index bf1ea49..04db534 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html
@@ -908,7 +908,7 @@ Note that the value <code>INLINE_AS_IF_EDIT</code> does not make sense for prope
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html
index f8949ed..9cf9bf6 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html
@@ -902,7 +902,7 @@ public class BugReport {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_024_navigable.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_024_navigable.html
index 882f1b2..fdf8887 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_024_navigable.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_024_navigable.html
@@ -911,7 +911,7 @@ public class Employee {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html
index e31c3fd..eabbb94 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html
@@ -895,7 +895,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html
index 3a796b6..7684e26 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html
@@ -894,7 +894,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html
index f5453ad..7775159 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html
@@ -909,7 +909,7 @@ public class Tenancy {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_028_repainting.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_028_repainting.html
index 08d74b9..26c3ede 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_028_repainting.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_028_repainting.html
@@ -917,7 +917,7 @@ public class Document {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_029_named.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_029_named.html
index 6e41e18..f3641b0 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_029_named.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_029_named.html
@@ -921,7 +921,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_030_hidden.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_030_hidden.html
index b6fd213..92f235e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_030_hidden.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_030_hidden.html
@@ -972,7 +972,7 @@ Annotating with <code>@Property(where=Where.NOWHERE)</code> overrides this.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html
index 7d92a71..2ab55b8 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html
@@ -910,7 +910,7 @@ All that said, the <a href="../../../../../../vw/2.0.0-M5/about.html" class="pag
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_010-examples-and-usage.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_010-examples-and-usage.html
index 498a478..7ed3e48 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_010-examples-and-usage.html
@@ -932,7 +932,7 @@ so that boilerplate-busting tools such as <a href="https://projectlombok.org/">P
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_021-optionality.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_021-optionality.html
index 8cc4f6a..dd69bf7 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_021-optionality.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_021-optionality.html
@@ -1050,7 +1050,7 @@ If optionality is required, then use the corresponding wrapper class (e.g. <code
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_022-editing.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_022-editing.html
index 351c195..ab48c33 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_022-editing.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_022-editing.html
@@ -919,7 +919,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_023-maxLength.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_023-maxLength.html
index a6c0833..fd955ea 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_023-maxLength.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_023-maxLength.html
@@ -949,7 +949,7 @@ For these non persistable properties the <code>maxLength</code> attribute is sti
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_024-mustSatisfy.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_024-mustSatisfy.html
index 09fc90d..354a38e 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_024-mustSatisfy.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_024-mustSatisfy.html
@@ -959,7 +959,7 @@ Rather than implement <code>Specification</code>, instead implement <code>Specif
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_025-projecting.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_025-projecting.html
index e5096f6..06750e7 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_025-projecting.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_025-projecting.html
@@ -921,7 +921,7 @@ public InvoiceSummary {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_026-domain-events.html b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_026-domain-events.html
index 5a7d7ed..77d1906 100644
--- a/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_026-domain-events.html
+++ b/content/refguide/2.0.0-M5/applib/index/annotation/hooks/Property_026-domain-events.html
@@ -1105,7 +1105,7 @@ However, events can be raised programmatically either by calling the <a href="..
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M5.20210409-1206</p>
+            <p>Revision: 2.0.0-M5.20210417-1912</p>
         </div>
... 28404 lines suppressed ...