diff --git a/STABILIZING.md b/STABILIZING.md
index 8565760bc..9a6dfb917 100644
--- a/STABILIZING.md
+++ b/STABILIZING.md
@@ -1,6 +1,6 @@
 # Stabilization Candidates
 
-_Generated on **Thu May 03 2018 17:08:40 GMT+0000 (UTC)**_
+_Generated on **Thu May 03 2018 19:01:43 GMT+0000 (UTC)**_
 
 
 ### Unknown Status, needs immediate attention
@@ -70,7 +70,7 @@ _Generated on **Thu May 03 2018 17:08:40 GMT+0000 (UTC)**_
 |[schemas/content/repository-policies/versioning](schemas/content/repository-policies/versioning.schema.json)|experimental|**51**|**35**|[abff929](https://github.com/adobe/xdm/commit/abff9298723bdeea2196be40b7ff9c21d76ac1ca "@Fixing lint errors. #accept-whatever-linter-says.") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/content/repository](schemas/content/repository.schema.json)|experimental|**51**|**51**|[9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/context/identity](schemas/context/identity.schema.json)|experimental|**51**|**51**|[9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/implementationdetails](schemas/context/implementationdetails.schema.json)|experimental|0|0|[48bd0d3](https://github.com/adobe/xdm/commit/48bd0d39f4b084a1c85361cefe25404b63569166 "typo") [d6fda6d](https://github.com/adobe/xdm/commit/d6fda6d7b873259a9cfd841eb2f8baed2f1302a3 "Add status for implementation details")|
+|[schemas/context/implementationdetails](schemas/context/implementationdetails.schema.json)|experimental|1|0|[48bd0d3](https://github.com/adobe/xdm/commit/48bd0d39f4b084a1c85361cefe25404b63569166 "typo") [d6fda6d](https://github.com/adobe/xdm/commit/d6fda6d7b873259a9cfd841eb2f8baed2f1302a3 "Add status for implementation details")|
 |[schemas/context/namespace](schemas/context/namespace.schema.json)|experimental|**51**|**51**|[9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/context/optinout](schemas/context/optinout.schema.json)|experimental|**51**|28|[2774a9e](https://github.com/adobe/xdm/commit/2774a9ed26474b8e06bf6fb6027ec1964c6ae82a "[trivial] sort channels alphabetically, fix typo") [8eb8737](https://github.com/adobe/xdm/commit/8eb87371853b38d45ca6c3d032398e584d5704ee "Add communication channel to experienceEvent, Add new Metrics.") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/context/person-name](schemas/context/person-name.schema.json)|experimental|**51**|24|[9056b22](https://github.com/adobe/xdm/commit/9056b225d9238e13a4d09797aab71e506ccc55a5 "[trivial] fix formatting") [6743faf](https://github.com/adobe/xdm/commit/6743fafe89f32b2f94e99588399a8e12e478ee72 "Updated descriptions of firstName and lastName - reflect that they are for the first and last fragement of the name - mention writing order - mention compatibility - mention preference for fullName") [8063b7b](https://github.com/adobe/xdm/commit/8063b7b39b9025c0ac197fc0734949b8da6ba082 "Update the description for first name") [a97da99](https://github.com/adobe/xdm/commit/a97da994decde3fa08be4665e22f1188fa111669 "Merge branch 'master' into platform-pr-personname") [dc1f3ea](https://github.com/adobe/xdm/commit/dc1f3ea5e829908921d0d902c58011583cb90cde "reverting to last/first from given/surname") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
@@ -80,15 +80,15 @@ _Generated on **Thu May 03 2018 17:08:40 GMT+0000 (UTC)**_
 |[schemas/context/profile](schemas/context/profile.schema.json)|experimental|**51**|**51**|[9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/context/search](schemas/context/search.schema.json)|experimental|**51**|**51**|[db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/context/subscription](schemas/context/subscription.schema.json)|experimental|**51**|**51**|[9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/webinfo](schemas/context/webinfo.schema.json)|experimental|0|0|[64111f7](https://github.com/adobe/xdm/commit/64111f7665bf74ac89e83fff56698700da105dfc "Status for web info")|
+|[schemas/context/webinfo](schemas/context/webinfo.schema.json)|experimental|1|1|[64111f7](https://github.com/adobe/xdm/commit/64111f7665bf74ac89e83fff56698700da105dfc "Status for web info")|
 |[schemas/context/webinteraction](schemas/context/webinteraction.schema.json)|experimental|21|21|[4d334eb](https://github.com/adobe/xdm/commit/4d334eb07989d8b9de1f83432aaf6135ad9df028 "Fixed description for web interaction") [4530775](https://github.com/adobe/xdm/commit/45307758ec8736f44a0eef3441659e2829e0dd10 "Corrected types") [313417f](https://github.com/adobe/xdm/commit/313417f0992045625cf2a63bf8f6f98718786cf9 "Renamed weblink to webinteraction Updated examples")|
 |[schemas/context/webpageview](schemas/context/webpageview.schema.json)|experimental|21|21|[4a9aeea](https://github.com/adobe/xdm/commit/4a9aeeaa9fcdbf31c7e942d0cb410bb7f7a5f0e9 "Improved description for web page view") [d7418c4](https://github.com/adobe/xdm/commit/d7418c425542de8b1dcbd5b830b530711f6c5ffa "Updated isErrorPage/isHomePage to drop 'is' Corrected references to webPageView") [930d727](https://github.com/adobe/xdm/commit/930d72795c0d444dc1276a8c287a3ac4bde10c13 "Renamed webPage to webPageView Updated all examples")|
-|[schemas/context/webreferrer](schemas/context/webreferrer.schema.json)|experimental|23|21|[3a96ff1](https://github.com/adobe/xdm/commit/3a96ff184a90d81114e2d5c3f2bf5b8db3577e2f "Updated webreferrer description") [77b6a74](https://github.com/adobe/xdm/commit/77b6a7417ee6679e9b2cdfc11135afa64d78a771 "Update webreferrer.schema.json") [ebca7ac](https://github.com/adobe/xdm/commit/ebca7ac41da3d8a8e4a79a90a49162150e1f3f54 "Simplified Type") [cc7d220](https://github.com/adobe/xdm/commit/cc7d220552293876ac9a2d1bab3edf1e235c5c98 "added support for unknown/noJs Added legacy support for Usenet") [3a15a31](https://github.com/adobe/xdm/commit/3a15a31cbc8a6fc2504949a6046d80e8cee18d45 "Added support for unknown/noJavascript Added legacy support for usenet") [4a8f0a8](https://github.com/adobe/xdm/commit/4a8f0a83c37a60f873dd559b8982af2dd81bfcaa "Moved referrer into a peer schema of webpage Updated license dates to 2018 Refined examples to better illustrate a single page case vs a cross site case Changes enum or referrer type to snale case Improved wording of several descriptions.")|
+|[schemas/context/webreferrer](schemas/context/webreferrer.schema.json)|experimental|24|21|[3a96ff1](https://github.com/adobe/xdm/commit/3a96ff184a90d81114e2d5c3f2bf5b8db3577e2f "Updated webreferrer description") [77b6a74](https://github.com/adobe/xdm/commit/77b6a7417ee6679e9b2cdfc11135afa64d78a771 "Update webreferrer.schema.json") [ebca7ac](https://github.com/adobe/xdm/commit/ebca7ac41da3d8a8e4a79a90a49162150e1f3f54 "Simplified Type") [cc7d220](https://github.com/adobe/xdm/commit/cc7d220552293876ac9a2d1bab3edf1e235c5c98 "added support for unknown/noJs Added legacy support for Usenet") [3a15a31](https://github.com/adobe/xdm/commit/3a15a31cbc8a6fc2504949a6046d80e8cee18d45 "Added support for unknown/noJavascript Added legacy support for usenet") [4a8f0a8](https://github.com/adobe/xdm/commit/4a8f0a83c37a60f873dd559b8982af2dd81bfcaa "Moved referrer into a peer schema of webpage Updated license dates to 2018 Refined examples to better illustrate a single page case vs a cross site case Changes enum or referrer type to snale case Improved wording of several descriptions.")|
 |[schemas/data/abandons](schemas/data/abandons.schema.json)|experimental|**51**|20|[163bf54](https://github.com/adobe/xdm/commit/163bf540ffcc04f4e05854ec03fa18abf1720721 "Renamed metric->metricdefinition") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/data/bounces](schemas/data/bounces.schema.json)|experimental|**51**|20|[163bf54](https://github.com/adobe/xdm/commit/163bf540ffcc04f4e05854ec03fa18abf1720721 "Renamed metric->metricdefinition") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/data/checkouts](schemas/data/checkouts.schema.json)|experimental|**51**|20|[163bf54](https://github.com/adobe/xdm/commit/163bf540ffcc04f4e05854ec03fa18abf1720721 "Renamed metric->metricdefinition") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/data/clicks](schemas/data/clicks.schema.json)|experimental|**51**|20|[163bf54](https://github.com/adobe/xdm/commit/163bf540ffcc04f4e05854ec03fa18abf1720721 "Renamed metric->metricdefinition") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/data/datasource](schemas/data/datasource.schema.json)|experimental|**51**|27|[9d82ca9](https://github.com/adobe/xdm/commit/9d82ca93b37dd7859ffe0e48a84efc948406d0cd "Fixing type in the description for code in datasource.schema.json") [290384d](https://github.com/adobe/xdm/commit/290384da30f802cad3ad59a4fa40d1b06917b543 "json lint cleanup") [445fc3e](https://github.com/adobe/xdm/commit/445fc3eb66d5af22d59d100762e6565dca4f31b4 "Corrected the datasource schema field xdm:name to xdm:code because it is a code for, not the name of the datasource.") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
+|[schemas/data/datasource](schemas/data/datasource.schema.json)|experimental|**51**|28|[9d82ca9](https://github.com/adobe/xdm/commit/9d82ca93b37dd7859ffe0e48a84efc948406d0cd "Fixing type in the description for code in datasource.schema.json") [290384d](https://github.com/adobe/xdm/commit/290384da30f802cad3ad59a4fa40d1b06917b543 "json lint cleanup") [445fc3e](https://github.com/adobe/xdm/commit/445fc3eb66d5af22d59d100762e6565dca4f31b4 "Corrected the datasource schema field xdm:name to xdm:code because it is a code for, not the name of the datasource.") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/data/discount](schemas/data/discount.schema.json)|experimental|**51**|**51**|[9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/data/impressions](schemas/data/impressions.schema.json)|experimental|**51**|20|[163bf54](https://github.com/adobe/xdm/commit/163bf540ffcc04f4e05854ec03fa18abf1720721 "Renamed metric->metricdefinition") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
 |[schemas/data/link-clicks](schemas/data/link-clicks.schema.json)|experimental|**51**|20|[163bf54](https://github.com/adobe/xdm/commit/163bf540ffcc04f4e05854ec03fa18abf1720721 "Renamed metric->metricdefinition") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
@@ -141,21 +141,21 @@ _Generated on **Thu May 03 2018 17:08:40 GMT+0000 (UTC)**_
 
 |Schema|Status|Status Modified Date|Last Non-trivial Change|Raw Commit Log Since Status Change|
 |------|------|--------------------|-----------------------|----------------------------------|
-|[schemas/assets/language-alternative](schemas/assets/language-alternative.schema.json)|stabilizing|**51**|1|[643af22](https://github.com/adobe/xdm/commit/643af226ebb84d644f35b8cf8a0d42f174a820e7 "Stabilize language-alternatives") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/common/address](schemas/common/address.schema.json)|stabilizing|**51**|29|[d0bc684](https://github.com/adobe/xdm/commit/d0bc68419d9ce4e964d8bbff7773e04437590acf "Move common schemas for 0.9 to 'stabilizing'") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/common/extensible](schemas/common/extensible.schema.json)|stabilizing|**51**|29|[d2a77b9](https://github.com/adobe/xdm/commit/d2a77b9ee7f8f600206b6e86f756064322e80d2d "Merge branch 'master' into platform-pr-stabilizing-09") [ccbcb77](https://github.com/adobe/xdm/commit/ccbcb7732c4b503840f62a53d40570b920439ae6 "Remove instances of old 'stLayer' prefix") [c37d2e9](https://github.com/adobe/xdm/commit/c37d2e9b40e85bf49c578454e5f2b30dc5a0125d "Rename 'stLayer:*' properties to 'xdm:*'") [e052510](https://github.com/adobe/xdm/commit/e052510bef95d24a1577baf4a632ba5edd489ef0 "Update extensible.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/common/organization](schemas/common/organization.schema.json)|stabilizing|**51**|29|[3da9a68](https://github.com/adobe/xdm/commit/3da9a68acceea5ee7c0805144a3d39e75f91ead3 "Update organization.schema.json") [e278271](https://github.com/adobe/xdm/commit/e27827151f095a78d2436d7b831273dd78fd30ac "Rename 'ns.adobe.com/external/...' to 'ns.adobe.com/xdm/external' to align with other external schema references") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/browserdetails](schemas/context/browserdetails.schema.json)|stabilizing|**51**|26|[f8d9f8b](https://github.com/adobe/xdm/commit/f8d9f8bd41176d7ca388b1d2f97d38de40cfff6b "Update browserdetails.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/commerce](schemas/context/commerce.schema.json)|stabilizing|**51**|26|[a424944](https://github.com/adobe/xdm/commit/a4249449cf8268d2dd357d462181e12e08dff25d "Update commerce.schema.json") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/device](schemas/context/device.schema.json)|stabilizing|**51**|14|[7ac8281](https://github.com/adobe/xdm/commit/7ac8281cc6f7ceae8a29bfe98e7b14b60091e422 "Merge branch 'master' into campaign-extensions-experienceEvent") [a7400fd](https://github.com/adobe/xdm/commit/a7400fd6a8732da1b275718f0acfa930e1e27342 "[trivial] fixes suggested in review. Iteration #4.") [6c98f3c](https://github.com/adobe/xdm/commit/6c98f3c6eb6148d0ca0f6930873047025a7272df "Update device.schema.json") [ac9024e](https://github.com/adobe/xdm/commit/ac9024eecd7741a624115f1089b457a818ac9e5c "Fix Issue #206 Adding Campaign's extension of Experience Events.") [e278271](https://github.com/adobe/xdm/commit/e27827151f095a78d2436d7b831273dd78fd30ac "Rename 'ns.adobe.com/external/...' to 'ns.adobe.com/xdm/external' to align with other external schema references") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/emailaddress](schemas/context/emailaddress.schema.json)|stabilizing|**51**|20|[6ad49e7](https://github.com/adobe/xdm/commit/6ad49e781d68809943e832e6c960490ca48847a3 "Update emailaddress.schema.json") [cfcfd58](https://github.com/adobe/xdm/commit/cfcfd589f0fadf7ad62580d273e279a016b52918 "Update emailaddress.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/enduserids](schemas/context/enduserids.schema.json)|stabilizing|**51**|23|[cd0c125](https://github.com/adobe/xdm/commit/cd0c125870abb52075755837d9fd2ba38c4291f9 "Merge branch 'master' into platform-pr-stabilizing-09") [c231497](https://github.com/adobe/xdm/commit/c23149762f50b30683200aa961446133d8acee48 "Update enduserids.schema.json") [11d47c5](https://github.com/adobe/xdm/commit/11d47c500fe9903e29e1878719aea79a3163d658 "Update enduserids.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/environment](schemas/context/environment.schema.json)|stabilizing|**51**|24|[9da39d2](https://github.com/adobe/xdm/commit/9da39d2de8cdf95d6cfb240aad0187a4e9db40dc "Merge branch 'master' into platform-pr-stabilizing-09") [7270577](https://github.com/adobe/xdm/commit/7270577990ed846a0354bb062c886cdaba80cf21 "[trivial] typo") [d47644d](https://github.com/adobe/xdm/commit/d47644dde8a38c5c4fcb8ea5739aac3d37794908 "Update environment.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/experienceevent](schemas/context/experienceevent.schema.json)|stabilizing|**51**|20|[cf7779a](https://github.com/adobe/xdm/commit/cf7779ab93002d44b56d90231d667552931f0b4e "Update experienceevent.schema.json") [b7bfb99](https://github.com/adobe/xdm/commit/b7bfb99b42ec7bb7be8e392da214ec469052f1e0 "Renamed field in ExperienceContext, according to #170") [c1bd8fa](https://github.com/adobe/xdm/commit/c1bd8fafbed57a187a2b0f9e2b31be72b185b1f3 "Renamed location context to place context, according to #170") [ea82e47](https://github.com/adobe/xdm/commit/ea82e47c4cdc2f0ecdcf5917f268c6c0ee7fbb85 "Merge branch 'master' into platform-pr-web") [2774a9e](https://github.com/adobe/xdm/commit/2774a9ed26474b8e06bf6fb6027ec1964c6ae82a "[trivial] sort channels alphabetically, fix typo") [0f38523](https://github.com/adobe/xdm/commit/0f385236d0597eaf21bbae48e3aa90861ee2c17c "Make channel a URI") [8eb8737](https://github.com/adobe/xdm/commit/8eb87371853b38d45ca6c3d032398e584d5704ee "Add communication channel to experienceEvent, Add new Metrics.") [c334796](https://github.com/adobe/xdm/commit/c334796a12f444f4f8edc895392df0e0ca7bef12 "Merge branch 'master' into platform-pr-web") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas") [9d483c8](https://github.com/adobe/xdm/commit/9d483c8d8e565895bdd77020830e42076ab31d6e "Merge branch 'master' into platform-pr-web") [3b487f6](https://github.com/adobe/xdm/commit/3b487f6b5a210d3d087ae61de287fe2d7976149d "Rename web to webinfo") [742fc8d](https://github.com/adobe/xdm/commit/742fc8dd91b1261c9d1ed51991d6cc2321eaf2f4 "Add web schema in context folder for experience event")|
-|[schemas/context/marketing](schemas/context/marketing.schema.json)|stabilizing|**51**|26|[266fca9](https://github.com/adobe/xdm/commit/266fca90001ac9a4505c5c5888e8ee67c8be45f1 "Update marketing.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/phonenumber](schemas/context/phonenumber.schema.json)|stabilizing|**51**|20|[d763dde](https://github.com/adobe/xdm/commit/d763dde9dc6bc27e4cf4224b057b809d66927425 "Update phonenumber.schema.json") [acb4818](https://github.com/adobe/xdm/commit/acb4818e53f908d5133f32d471e3b28f1dd177a1 "Update phonenumber.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/context/pushnotificationtoken](schemas/context/pushnotificationtoken.schema.json)|stabilizing|**51**|26|[a594370](https://github.com/adobe/xdm/commit/a5943702e3b32427dcdd0bf3d0ac7dec0aa46cd9 "Update pushnotificationtoken.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
-|[schemas/data/measure](schemas/data/measure.schema.json)|stabilizing|**51**|26|[3d5ce83](https://github.com/adobe/xdm/commit/3d5ce83ae130e083fe721590fa6187aabff5171e "Update measure.schema.json") [9943569](https://github.com/adobe/xdm/commit/9943569c72d108fc9daa712baa865d3a667e20b1 "Add updated schemas from lint") [db1e50b](https://github.com/adobe/xdm/commit/db1e50b0f2b520433afb2644900ddab3794511b0 "Add convenience script for mass-updating schemas")|
+|[schemas/assets/language-alternative](schemas/assets/language-alternative.schema.json)|stabilizing|1|1|[643af22](https://github.com/adobe/xdm/commit/643af226ebb84d644f35b8cf8a0d42f174a820e7 "Stabilize language-alternatives")|
+|[schemas/common/address](schemas/common/address.schema.json)|stabilizing|30|30|[d0bc684](https://github.com/adobe/xdm/commit/d0bc68419d9ce4e964d8bbff7773e04437590acf "Move common schemas for 0.9 to 'stabilizing'")|
+|[schemas/common/extensible](schemas/common/extensible.schema.json)|stabilizing|30|29|[d2a77b9](https://github.com/adobe/xdm/commit/d2a77b9ee7f8f600206b6e86f756064322e80d2d "Merge branch 'master' into platform-pr-stabilizing-09") [ccbcb77](https://github.com/adobe/xdm/commit/ccbcb7732c4b503840f62a53d40570b920439ae6 "Remove instances of old 'stLayer' prefix") [c37d2e9](https://github.com/adobe/xdm/commit/c37d2e9b40e85bf49c578454e5f2b30dc5a0125d "Rename 'stLayer:*' properties to 'xdm:*'") [e052510](https://github.com/adobe/xdm/commit/e052510bef95d24a1577baf4a632ba5edd489ef0 "Update extensible.schema.json")|
+|[schemas/common/organization](schemas/common/organization.schema.json)|stabilizing|30|30|[3da9a68](https://github.com/adobe/xdm/commit/3da9a68acceea5ee7c0805144a3d39e75f91ead3 "Update organization.schema.json")|
+|[schemas/context/browserdetails](schemas/context/browserdetails.schema.json)|stabilizing|26|26|[f8d9f8b](https://github.com/adobe/xdm/commit/f8d9f8bd41176d7ca388b1d2f97d38de40cfff6b "Update browserdetails.schema.json")|
+|[schemas/context/commerce](schemas/context/commerce.schema.json)|stabilizing|26|26|[a424944](https://github.com/adobe/xdm/commit/a4249449cf8268d2dd357d462181e12e08dff25d "Update commerce.schema.json")|
+|[schemas/context/device](schemas/context/device.schema.json)|stabilizing|26|14|[7ac8281](https://github.com/adobe/xdm/commit/7ac8281cc6f7ceae8a29bfe98e7b14b60091e422 "Merge branch 'master' into campaign-extensions-experienceEvent") [a7400fd](https://github.com/adobe/xdm/commit/a7400fd6a8732da1b275718f0acfa930e1e27342 "[trivial] fixes suggested in review. Iteration #4.") [6c98f3c](https://github.com/adobe/xdm/commit/6c98f3c6eb6148d0ca0f6930873047025a7272df "Update device.schema.json") [ac9024e](https://github.com/adobe/xdm/commit/ac9024eecd7741a624115f1089b457a818ac9e5c "Fix Issue #206 Adding Campaign's extension of Experience Events.")|
+|[schemas/context/emailaddress](schemas/context/emailaddress.schema.json)|stabilizing|26|20|[6ad49e7](https://github.com/adobe/xdm/commit/6ad49e781d68809943e832e6c960490ca48847a3 "Update emailaddress.schema.json") [cfcfd58](https://github.com/adobe/xdm/commit/cfcfd589f0fadf7ad62580d273e279a016b52918 "Update emailaddress.schema.json")|
+|[schemas/context/enduserids](schemas/context/enduserids.schema.json)|stabilizing|26|23|[cd0c125](https://github.com/adobe/xdm/commit/cd0c125870abb52075755837d9fd2ba38c4291f9 "Merge branch 'master' into platform-pr-stabilizing-09") [c231497](https://github.com/adobe/xdm/commit/c23149762f50b30683200aa961446133d8acee48 "Update enduserids.schema.json") [11d47c5](https://github.com/adobe/xdm/commit/11d47c500fe9903e29e1878719aea79a3163d658 "Update enduserids.schema.json")|
+|[schemas/context/environment](schemas/context/environment.schema.json)|stabilizing|26|24|[9da39d2](https://github.com/adobe/xdm/commit/9da39d2de8cdf95d6cfb240aad0187a4e9db40dc "Merge branch 'master' into platform-pr-stabilizing-09") [7270577](https://github.com/adobe/xdm/commit/7270577990ed846a0354bb062c886cdaba80cf21 "[trivial] typo") [d47644d](https://github.com/adobe/xdm/commit/d47644dde8a38c5c4fcb8ea5739aac3d37794908 "Update environment.schema.json")|
+|[schemas/context/experienceevent](schemas/context/experienceevent.schema.json)|stabilizing|20|20|[cf7779a](https://github.com/adobe/xdm/commit/cf7779ab93002d44b56d90231d667552931f0b4e "Update experienceevent.schema.json")|
+|[schemas/context/marketing](schemas/context/marketing.schema.json)|stabilizing|26|26|[266fca9](https://github.com/adobe/xdm/commit/266fca90001ac9a4505c5c5888e8ee67c8be45f1 "Update marketing.schema.json")|
+|[schemas/context/phonenumber](schemas/context/phonenumber.schema.json)|stabilizing|26|20|[d763dde](https://github.com/adobe/xdm/commit/d763dde9dc6bc27e4cf4224b057b809d66927425 "Update phonenumber.schema.json") [acb4818](https://github.com/adobe/xdm/commit/acb4818e53f908d5133f32d471e3b28f1dd177a1 "Update phonenumber.schema.json")|
+|[schemas/context/pushnotificationtoken](schemas/context/pushnotificationtoken.schema.json)|stabilizing|26|26|[a594370](https://github.com/adobe/xdm/commit/a5943702e3b32427dcdd0bf3d0ac7dec0aa46cd9 "Update pushnotificationtoken.schema.json")|
+|[schemas/data/measure](schemas/data/measure.schema.json)|stabilizing|27|27|[3d5ce83](https://github.com/adobe/xdm/commit/3d5ce83ae130e083fe721590fa6187aabff5171e "Update measure.schema.json")|
 
 
 
diff --git a/docs/reference/README.md b/docs/reference/README.md
index 0d098efae..6630e79f2 100644
--- a/docs/reference/README.md
+++ b/docs/reference/README.md
@@ -4,6 +4,32 @@
 
 
 
+## /assets/
+
+* [Aggregated Asset](./assets/aggregated-asset.schema.md) – `https://ns.adobe.com/xdm/assets/aggregated-asset` (Experimental)
+* [Artboard](./assets/artboard.schema.md) – `https://ns.adobe.com/xdm/assets/artboard` (Experimental)
+* [Asset](./assets/asset.schema.md) – `https://ns.adobe.com/xdm/assets/asset` (Experimental)
+* [Copyright Owner](./assets/copyright-owner.schema.md) – `https://ns.adobe.com/xdm/assets/copyright-owner` (Experimental)
+* [Font](./assets/font.schema.md) – `https://ns.adobe.com/xdm/assets/font` (Experimental)
+* [Image](./assets/image.schema.md) – `https://ns.adobe.com/xdm/assets/image` (Experimental)
+* [Language Alternative](./assets/language-alternative.schema.md) – `https://ns.adobe.com/xdm/assets/language-alternative` (Stabilizing)
+* [Layer](./assets/layer.schema.md) – `https://ns.adobe.com/xdm/assets/layer` (Experimental)
+* [Layer Group](./assets/layer-group.schema.md) – `https://ns.adobe.com/xdm/assets/layer-group` (Experimental)
+* [Rectangular Media](./assets/rectangular.schema.md) – `https://ns.adobe.com/xdm/assets/rectangular` (Experimental)
+* [Rectangular Object (measured in variable unit)](./assets/variable-unit-rectangular.schema.md) – `https://ns.adobe.com/xdm/assets/variable-unit-rectangular` (Experimental)
+* [Resource Event](./assets/resource-event.schema.md) – `https://ns.adobe.com/xdm/assets/resource-event` (Experimental)
+* [Video](./assets/video.schema.md) – `https://ns.adobe.com/xdm/assets/video` (Experimental)
+
+## /content/
+
+* [Component Container](./content/component-container.schema.md) – `https://ns.adobe.com/xdm/content/component-container` (Experimental)
+* [Componentized Page](./content/componentized-page.schema.md) – `https://ns.adobe.com/xdm/content/componentized-page` (Experimental)
+* [Content](./content/content.schema.md) – `https://ns.adobe.com/xdm/content/content` (Experimental)
+* [Content Repository](./content/repository.schema.md) – `https://ns.adobe.com/xdm/content/repository` (Experimental)
+* [Page Component](./content/page-component.schema.md) – `https://ns.adobe.com/xdm/content/page-component` (Experimental)
+* [Product](./content/product.schema.md) – `https://ns.adobe.com/xdm/context/product` (Experimental)
+* [Product List Item](./content/productlistitem.schema.md) – `https://ns.adobe.com/xdm/content/productlistitem` (Experimental)
+
 ## /common/
 
 * [Address](./common/address.schema.md) – `https://ns.adobe.com/xdm/common/address` (Stabilizing)
@@ -17,16 +43,6 @@
 * [Page](./common/page.schema.md) – `https://ns.adobe.com/xdm/common/page` (Experimental)
 * [Principal](./common/principal.schema.md) – `https://ns.adobe.com/xdm/common/principal` (Experimental)
 
-## /content/
-
-* [Component Container](./content/component-container.schema.md) – `https://ns.adobe.com/xdm/content/component-container` (Experimental)
-* [Componentized Page](./content/componentized-page.schema.md) – `https://ns.adobe.com/xdm/content/componentized-page` (Experimental)
-* [Content](./content/content.schema.md) – `https://ns.adobe.com/xdm/content/content` (Experimental)
-* [Content Repository](./content/repository.schema.md) – `https://ns.adobe.com/xdm/content/repository` (Experimental)
-* [Page Component](./content/page-component.schema.md) – `https://ns.adobe.com/xdm/content/page-component` (Experimental)
-* [Product](./content/product.schema.md) – `https://ns.adobe.com/xdm/context/product` (Experimental)
-* [Product List Item](./content/productlistitem.schema.md) – `https://ns.adobe.com/xdm/content/productlistitem` (Experimental)
-
 ## /channels/
 
 * [ADM](./channels/adm.schema.md) – `https://ns.adobe.com/xdm/channels/adm` (Experimental)
@@ -50,21 +66,33 @@
 * [Web](./channels/mobile-app.schema.md) – `https://ns.adobe.com/xdm/channels/mobile-app` (Experimental)
 * [Web](./channels/web.schema.md) – `https://ns.adobe.com/xdm/channels/web` (Experimental)
 
-## /assets/
+## /context/
 
-* [Aggregated Asset](./assets/aggregated-asset.schema.md) – `https://ns.adobe.com/xdm/assets/aggregated-asset` (Experimental)
-* [Artboard](./assets/artboard.schema.md) – `https://ns.adobe.com/xdm/assets/artboard` (Experimental)
-* [Asset](./assets/asset.schema.md) – `https://ns.adobe.com/xdm/assets/asset` (Experimental)
-* [Copyright Owner](./assets/copyright-owner.schema.md) – `https://ns.adobe.com/xdm/assets/copyright-owner` (Experimental)
-* [Font](./assets/font.schema.md) – `https://ns.adobe.com/xdm/assets/font` (Experimental)
-* [Image](./assets/image.schema.md) – `https://ns.adobe.com/xdm/assets/image` (Experimental)
-* [Language Alternative](./assets/language-alternative.schema.md) – `https://ns.adobe.com/xdm/assets/language-alternative` (Stabilizing)
-* [Layer](./assets/layer.schema.md) – `https://ns.adobe.com/xdm/assets/layer` (Experimental)
-* [Layer Group](./assets/layer-group.schema.md) – `https://ns.adobe.com/xdm/assets/layer-group` (Experimental)
-* [Rectangular Media](./assets/rectangular.schema.md) – `https://ns.adobe.com/xdm/assets/rectangular` (Experimental)
-* [Rectangular Object (measured in variable unit)](./assets/variable-unit-rectangular.schema.md) – `https://ns.adobe.com/xdm/assets/variable-unit-rectangular` (Experimental)
-* [Resource Event](./assets/resource-event.schema.md) – `https://ns.adobe.com/xdm/assets/resource-event` (Experimental)
-* [Video](./assets/video.schema.md) – `https://ns.adobe.com/xdm/assets/video` (Experimental)
+* [Browser Details](./context/browserdetails.schema.md) – `https://ns.adobe.com/xdm/context/browserdetails` (Stabilizing)
+* [Commerce](./context/commerce.schema.md) – `https://ns.adobe.com/xdm/context/commerce` (Stabilizing)
+* [Device](./context/device.schema.md) – `https://ns.adobe.com/xdm/context/device` (Stabilizing)
+* [Email Address](./context/emailaddress.schema.md) – `https://ns.adobe.com/xdm/context/emailaddress` (Stabilizing)
+* [End User IDs](./context/enduserids.schema.md) – `https://ns.adobe.com/xdm/context/enduserids` (Stabilizing)
+* [Environment](./context/environment.schema.md) – `https://ns.adobe.com/xdm/context/environment` (Stabilizing)
+* [ExperienceEvent](./context/experienceevent.schema.md) – `https://ns.adobe.com/xdm/context/experienceevent` (Stabilizing)
+* [Identity](./context/identity.schema.md) – `https://ns.adobe.com/xdm/context/identity` (Experimental)
+* [Implementation Details](./context/implementationdetails.schema.md) – `https://ns.adobe.com/xdm/context/implementationdetails` (Experimental)
+* [Marketing](./context/marketing.schema.md) – `https://ns.adobe.com/xdm/context/marketing` (Stabilizing)
+* [Namespace](./context/namespace.schema.md) – `https://ns.adobe.com/xdm/context/namespace` (Experimental)
+* [OptInOut](./context/optinout.schema.md) – `https://ns.adobe.com/xdm/context/optinout` (Experimental)
+* [Person](./context/person.schema.md) – `https://ns.adobe.com/xdm/context/person` (Experimental)
+* [Person Name](./context/person-name.schema.md) – `https://ns.adobe.com/xdm/context/person-name` (Experimental)
+* [Phone Number](./context/phonenumber.schema.md) – `https://ns.adobe.com/xdm/context/phonenumber` (Stabilizing)
+* [Place](./context/place.schema.md) – `https://ns.adobe.com/xdm/context/place` (Experimental)
+* [Place Context](./context/placecontext.schema.md) – `https://ns.adobe.com/xdm/context/placecontext` (Experimental)
+* [Profile](./context/profile.schema.md) – `https://ns.adobe.com/xdm/context/profile` (Experimental)
+* [Push Notification Token](./context/pushnotificationtoken.schema.md) – `https://ns.adobe.com/xdm/context/pushnotificationtoken` (Stabilizing)
+* [Search](./context/search.schema.md) – `https://ns.adobe.com/xdm/context/search` (Experimental)
+* [Subscription](./context/subscription.schema.md) – `https://ns.adobe.com/xdm/context/subscription` (Experimental)
+* [Web Information](./context/webinfo.schema.md) – `https://ns.adobe.com/xdm/context/webinfo` (Experimental)
+* [Web Interaction](./context/webinteraction.schema.md) – `https://ns.adobe.com/xdm/context/webinteraction` (Experimental)
+* [Web Page View](./context/webpageview.schema.md) – `https://ns.adobe.com/xdm/context/webpageview` (Experimental)
+* [Web Referrer](./context/webreferrer.schema.md) – `https://ns.adobe.com/xdm/context/webreferrer` (Experimental)
 
 ## /data/
 
@@ -98,33 +126,11 @@
 * [unsubscriptions](./data/unsubscriptions.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/unsubscriptions` (Experimental)
 * [user-complaints](./data/user-complaints.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/user-complaints` (Experimental)
 
-## /context/
+## /content/repository-policies/
 
-* [Browser Details](./context/browserdetails.schema.md) – `https://ns.adobe.com/xdm/context/browserdetails` (Stabilizing)
-* [Commerce](./context/commerce.schema.md) – `https://ns.adobe.com/xdm/context/commerce` (Stabilizing)
-* [Device](./context/device.schema.md) – `https://ns.adobe.com/xdm/context/device` (Stabilizing)
-* [Email Address](./context/emailaddress.schema.md) – `https://ns.adobe.com/xdm/context/emailaddress` (Stabilizing)
-* [End User IDs](./context/enduserids.schema.md) – `https://ns.adobe.com/xdm/context/enduserids` (Stabilizing)
-* [Environment](./context/environment.schema.md) – `https://ns.adobe.com/xdm/context/environment` (Stabilizing)
-* [ExperienceEvent](./context/experienceevent.schema.md) – `https://ns.adobe.com/xdm/context/experienceevent` (Stabilizing)
-* [Identity](./context/identity.schema.md) – `https://ns.adobe.com/xdm/context/identity` (Experimental)
-* [Implementation Details](./context/implementationdetails.schema.md) – `https://ns.adobe.com/xdm/context/implementationdetails` (Experimental)
-* [Marketing](./context/marketing.schema.md) – `https://ns.adobe.com/xdm/context/marketing` (Stabilizing)
-* [Namespace](./context/namespace.schema.md) – `https://ns.adobe.com/xdm/context/namespace` (Experimental)
-* [OptInOut](./context/optinout.schema.md) – `https://ns.adobe.com/xdm/context/optinout` (Experimental)
-* [Person](./context/person.schema.md) – `https://ns.adobe.com/xdm/context/person` (Experimental)
-* [Person Name](./context/person-name.schema.md) – `https://ns.adobe.com/xdm/context/person-name` (Experimental)
-* [Phone Number](./context/phonenumber.schema.md) – `https://ns.adobe.com/xdm/context/phonenumber` (Stabilizing)
-* [Place](./context/place.schema.md) – `https://ns.adobe.com/xdm/context/place` (Experimental)
-* [Place Context](./context/placecontext.schema.md) – `https://ns.adobe.com/xdm/context/placecontext` (Experimental)
-* [Profile](./context/profile.schema.md) – `https://ns.adobe.com/xdm/context/profile` (Experimental)
-* [Push Notification Token](./context/pushnotificationtoken.schema.md) – `https://ns.adobe.com/xdm/context/pushnotificationtoken` (Stabilizing)
-* [Search](./context/search.schema.md) – `https://ns.adobe.com/xdm/context/search` (Experimental)
-* [Subscription](./context/subscription.schema.md) – `https://ns.adobe.com/xdm/context/subscription` (Experimental)
-* [Web Information](./context/webinfo.schema.md) – `https://ns.adobe.com/xdm/context/webinfo` (Experimental)
-* [Web Interaction](./context/webinteraction.schema.md) – `https://ns.adobe.com/xdm/context/webinteraction` (Experimental)
-* [Web Page View](./context/webpageview.schema.md) – `https://ns.adobe.com/xdm/context/webpageview` (Experimental)
-* [Web Referrer](./context/webreferrer.schema.md) – `https://ns.adobe.com/xdm/context/webreferrer` (Experimental)
+* [At-Rest Encryption](./content/repository-policies/encryption.schema.md) – `https://ns.adobe.com/xdm/content/repository-policies/encryption` (Experimental)
+* [Storage Quota](./content/repository-policies/quota.schema.md) – `https://ns.adobe.com/xdm/content/repository-policies/quota` (Experimental)
+* [Versioning](./content/repository-policies/versioning.schema.md) – `https://ns.adobe.com/xdm/content/repository-policies/versioning` (Experimental)
 
 ## /common/event/
 
@@ -136,18 +142,6 @@
 * [Unpublished Event](./common/event/unpublished.schema.md) – `https://ns.adobe.com/xdm/common/event/unpublished` (Experimental)
 * [Updated Event](./common/event/updated.schema.md) – `https://ns.adobe.com/xdm/common/event/updated` (Experimental)
 
-## /content/repository-policies/
-
-* [At-Rest Encryption](./content/repository-policies/encryption.schema.md) – `https://ns.adobe.com/xdm/content/repository-policies/encryption` (Experimental)
-* [Storage Quota](./content/repository-policies/quota.schema.md) – `https://ns.adobe.com/xdm/content/repository-policies/quota` (Experimental)
-* [Versioning](./content/repository-policies/versioning.schema.md) – `https://ns.adobe.com/xdm/content/repository-policies/versioning` (Experimental)
-
-## /external/schema/
-
-* [Geo Circle](./external/schema/geocircle.schema.md) – `http://schema.org/GeoCircle` (Experimental)
-* [Geo Coordinates](./external/schema/geocoordinates.schema.md) – `http://schema.org/GeoCoordinates` (Experimental)
-* [Geo Shape](./external/schema/geoshape.schema.md) – `http://schema.org/GeoShape` (Experimental)
-
 ## /external/hal/
 
 * [HAL Link](./external/hal/hal-link.schema.md) – `https://ns.adobe.com/xdm/external/hal/link` (Experimental)
@@ -177,3 +171,9 @@
 * [Object](./external/activity-streams-2/object.schema.md) – `https://ns.adobe.com/xdm/external/activity-streams-2/object` (Experimental)
 * [RDF Language Tagged String](./external/activity-streams-2/rdf-langstring.schema.md) – `https://ns.adobe.com/xdm/external/activity-streams-2/rdf-langstring` (Experimental)
 
+## /external/schema/
+
+* [Geo Circle](./external/schema/geocircle.schema.md) – `http://schema.org/GeoCircle` (Experimental)
+* [Geo Coordinates](./external/schema/geocoordinates.schema.md) – `http://schema.org/GeoCoordinates` (Experimental)
+* [Geo Shape](./external/schema/geoshape.schema.md) – `http://schema.org/GeoShape` (Experimental)
+
diff --git a/docs/reference/assets/video.schema.json b/docs/reference/assets/video.schema.json
index f65901663..d0994f788 100644
--- a/docs/reference/assets/video.schema.json
+++ b/docs/reference/assets/video.schema.json
@@ -65,7 +65,7 @@
     "meta:status": "experimental",
     "examples": [
         {
-            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
+            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
             "xmp:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
@@ -79,11 +79,11 @@
             "tiff:imageLength": 2160,
             "tiff:imageWidth": 3840,
             "xdm:aspectRatio": 1.77777777778,
-            "xdm:extent": 10920000,
-            "xdm:videoFrameRate": "f48s1"
+            "xdm:extent": 11700000,
+            "xdm:videoFrameRate": "NTSC"
         },
         {
-            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
+            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
             "xmp:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
@@ -97,8 +97,8 @@
             "tiff:imageLength": 2160,
             "tiff:imageWidth": 3840,
             "xdm:aspectRatio": 1.77777777778,
-            "xdm:extent": 11700000,
-            "xdm:videoFrameRate": "NTSC"
+            "xdm:extent": 10920000,
+            "xdm:videoFrameRate": "f48s1"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/reference/assets/video.schema.md b/docs/reference/assets/video.schema.md
index 9d03753ff..fd90b183c 100644
--- a/docs/reference/assets/video.schema.md
+++ b/docs/reference/assets/video.schema.md
@@ -21,7 +21,7 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
 
 ```json
 {
-  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
+  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
   "xmp:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
@@ -35,14 +35,14 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
   "tiff:imageLength": 2160,
   "tiff:imageWidth": 3840,
   "xdm:aspectRatio": 1.77777777778,
-  "xdm:extent": 10920000,
-  "xdm:videoFrameRate": "f48s1"
+  "xdm:extent": 11700000,
+  "xdm:videoFrameRate": "NTSC"
 }
 ```
 
 ```json
 {
-  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
+  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
   "xmp:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
@@ -56,8 +56,8 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
   "tiff:imageLength": 2160,
   "tiff:imageWidth": 3840,
   "xdm:aspectRatio": 1.77777777778,
-  "xdm:extent": 11700000,
-  "xdm:videoFrameRate": "NTSC"
+  "xdm:extent": 10920000,
+  "xdm:videoFrameRate": "f48s1"
 }
 ```
 
diff --git a/docs/reference/common/eventenvelope.schema.json b/docs/reference/common/eventenvelope.schema.json
index 5e1c011ad..c74be9e0c 100644
--- a/docs/reference/common/eventenvelope.schema.json
+++ b/docs/reference/common/eventenvelope.schema.json
@@ -68,29 +68,6 @@
                 "repo:etag": "\"6fc55d0389d856ae7deccebba54f110e\""
             }
         },
-        {
-            "@type": "https://ns.adobe.com/xdm/common/event/created",
-            "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
-            "activitystreams:published": "2016-07-16T19:20:30+01:00",
-            "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
-            "activitystreams:to": {
-                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
-            },
-            "activitystreams:generator": {
-                "@type": "https://ns.adobe.com/xdm/content/repository",
-                "xdm:root": "https://cc-api-storage-stage.adobe.io/"
-            },
-            "activitystreams:actor": {
-                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
-            },
-            "activitystreams:object": {
-                "@type": "https://ns.adobe.com/xdm/assets/asset",
-                "repo:assetID": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
-                "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185"
-            }
-        },
         {
             "@type": "https://ns.adobe.com/xdm/common/event/updated",
             "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
@@ -165,6 +142,29 @@
                 "dc:title": "Vintage Collection",
                 "xdm:path": "/content/geometrixx/en/vintage.html"
             }
+        },
+        {
+            "@type": "https://ns.adobe.com/xdm/common/event/created",
+            "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
+            "activitystreams:published": "2016-07-16T19:20:30+01:00",
+            "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
+            "activitystreams:to": {
+                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+            },
+            "activitystreams:generator": {
+                "@type": "https://ns.adobe.com/xdm/content/repository",
+                "xdm:root": "https://cc-api-storage-stage.adobe.io/"
+            },
+            "activitystreams:actor": {
+                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+            },
+            "activitystreams:object": {
+                "@type": "https://ns.adobe.com/xdm/assets/asset",
+                "repo:assetID": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
+                "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185"
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/reference/common/eventenvelope.schema.md b/docs/reference/common/eventenvelope.schema.md
index 4def26ec1..8216a5fc1 100644
--- a/docs/reference/common/eventenvelope.schema.md
+++ b/docs/reference/common/eventenvelope.schema.md
@@ -49,32 +49,6 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
 }
 ```
 
-```json
-{
-  "@type": "https://ns.adobe.com/xdm/common/event/created",
-  "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
-  "activitystreams:published": "2016-07-16T19:20:30+01:00",
-  "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
-  "activitystreams:to": {
-    "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-    "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
-  },
-  "activitystreams:generator": {
-    "@type": "https://ns.adobe.com/xdm/content/repository",
-    "xdm:root": "https://cc-api-storage-stage.adobe.io/"
-  },
-  "activitystreams:actor": {
-    "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-    "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
-  },
-  "activitystreams:object": {
-    "@type": "https://ns.adobe.com/xdm/assets/asset",
-    "repo:assetID": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
-    "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185"
-  }
-}
-```
-
 ```json
 {
   "@type": "https://ns.adobe.com/xdm/common/event/updated",
@@ -159,6 +133,32 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
 }
 ```
 
+```json
+{
+  "@type": "https://ns.adobe.com/xdm/common/event/created",
+  "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
+  "activitystreams:published": "2016-07-16T19:20:30+01:00",
+  "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
+  "activitystreams:to": {
+    "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+    "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+  },
+  "activitystreams:generator": {
+    "@type": "https://ns.adobe.com/xdm/content/repository",
+    "xdm:root": "https://cc-api-storage-stage.adobe.io/"
+  },
+  "activitystreams:actor": {
+    "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+    "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+  },
+  "activitystreams:object": {
+    "@type": "https://ns.adobe.com/xdm/assets/asset",
+    "repo:assetID": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
+    "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185"
+  }
+}
+```
+
 
 # EventEnvelope Properties
 
diff --git a/docs/reference/common/extensible.schema.json b/docs/reference/common/extensible.schema.json
index 5af29debb..44d5a4a2e 100644
--- a/docs/reference/common/extensible.schema.json
+++ b/docs/reference/common/extensible.schema.json
@@ -251,14 +251,13 @@
     "meta:status": "stabilizing",
     "examples": [
         {
-            "https://ns.example.com/asset_name": "custom_asset_1",
             "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
             "xdm:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
             "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
             "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
-            "xdm:repository_lastModifiedBy": "2017-09-26T15:52:25+00:00",
+            "xdm:repositoryLastModifiedBy": "2017-09-26T15:52:25+00:00",
             "repo:version": "15",
             "dc:title": "This is an example",
             "repo:size": 1632418,
@@ -311,13 +310,14 @@
             "repo:etag": "15"
         },
         {
+            "https://ns.example.com/asset_name": "custom_asset_1",
             "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
             "xdm:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
             "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
             "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
-            "xdm:repositoryLastModifiedBy": "2017-09-26T15:52:25+00:00",
+            "xdm:repository_lastModifiedBy": "2017-09-26T15:52:25+00:00",
             "repo:version": "15",
             "dc:title": "This is an example",
             "repo:size": 1632418,
diff --git a/docs/reference/common/extensible.schema.md b/docs/reference/common/extensible.schema.md
index 51cc2778b..ddacf43db 100644
--- a/docs/reference/common/extensible.schema.md
+++ b/docs/reference/common/extensible.schema.md
@@ -27,14 +27,13 @@ Replace `#/definitions/…` with the correct path to the `definitions` object in
 
 ```json
 {
-  "https://ns.example.com/asset_name": "custom_asset_1",
   "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
   "xdm:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
   "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
   "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
-  "xdm:repository_lastModifiedBy": "2017-09-26T15:52:25+00:00",
+  "xdm:repositoryLastModifiedBy": "2017-09-26T15:52:25+00:00",
   "repo:version": "15",
   "dc:title": "This is an example",
   "repo:size": 1632418,
@@ -93,13 +92,14 @@ Replace `#/definitions/…` with the correct path to the `definitions` object in
 
 ```json
 {
+  "https://ns.example.com/asset_name": "custom_asset_1",
   "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
   "xdm:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
   "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
   "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
-  "xdm:repositoryLastModifiedBy": "2017-09-26T15:52:25+00:00",
+  "xdm:repository_lastModifiedBy": "2017-09-26T15:52:25+00:00",
   "repo:version": "15",
   "dc:title": "This is an example",
   "repo:size": 1632418,
diff --git a/docs/reference/external/hal/hal-link.schema.json b/docs/reference/external/hal/hal-link.schema.json
index 96b44241c..4764f5983 100644
--- a/docs/reference/external/hal/hal-link.schema.json
+++ b/docs/reference/external/hal/hal-link.schema.json
@@ -108,11 +108,11 @@
     "meta:status": "experimental",
     "examples": [
         {
-            "href": "http://www.adobe.com/{product}",
-            "templated": true
+            "href": "http://www.adobe.com/"
         },
         {
-            "href": "http://www.adobe.com/"
+            "href": "http://www.adobe.com/{product}",
+            "templated": true
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/reference/external/hal/hal-link.schema.md b/docs/reference/external/hal/hal-link.schema.md
index 42d478408..0d60b9977 100644
--- a/docs/reference/external/hal/hal-link.schema.md
+++ b/docs/reference/external/hal/hal-link.schema.md
@@ -18,14 +18,14 @@ https://ns.adobe.com/xdm/external/hal/link
 
 ```json
 {
-  "href": "http://www.adobe.com/{product}",
-  "templated": true
+  "href": "http://www.adobe.com/"
 }
 ```
 
 ```json
 {
-  "href": "http://www.adobe.com/"
+  "href": "http://www.adobe.com/{product}",
+  "templated": true
 }
 ```
 
diff --git a/docs/reference/external/hal/hal.schema.json b/docs/reference/external/hal/hal.schema.json
index f827b5c6e..3fa44f991 100644
--- a/docs/reference/external/hal/hal.schema.json
+++ b/docs/reference/external/hal/hal.schema.json
@@ -280,6 +280,46 @@
     ],
     "meta:status": "experimental",
     "examples": [
+        {
+            "_links": {
+                "self": {
+                    "href": "/orders/523"
+                },
+                "warehouse": {
+                    "href": "/warehouse/56"
+                },
+                "invoice": {
+                    "href": "/invoices/873"
+                }
+            },
+            "currency": "USD",
+            "status": "shipped",
+            "total": 10.2
+        },
+        {
+            "_links": {
+                "self": {
+                    "href": "/orders/523"
+                },
+                "warehouses": [
+                    {
+                        "href": "/warehouse/56"
+                    },
+                    {
+                        "href": "/warehouse/56"
+                    },
+                    {
+                        "href": "/warehouse/56"
+                    }
+                ],
+                "invoice": {
+                    "href": "/invoices/873"
+                }
+            },
+            "currency": "USD",
+            "status": "shipped",
+            "total": 10.2
+        },
         {
             "_links": {
                 "self": {
@@ -324,46 +364,6 @@
             "currency": "USD",
             "status": "shipped",
             "total": 10.2
-        },
-        {
-            "_links": {
-                "self": {
-                    "href": "/orders/523"
-                },
-                "warehouse": {
-                    "href": "/warehouse/56"
-                },
-                "invoice": {
-                    "href": "/invoices/873"
-                }
-            },
-            "currency": "USD",
-            "status": "shipped",
-            "total": 10.2
-        },
-        {
-            "_links": {
-                "self": {
-                    "href": "/orders/523"
-                },
-                "warehouses": [
-                    {
-                        "href": "/warehouse/56"
-                    },
-                    {
-                        "href": "/warehouse/56"
-                    },
-                    {
-                        "href": "/warehouse/56"
-                    }
-                ],
-                "invoice": {
-                    "href": "/invoices/873"
-                }
-            },
-            "currency": "USD",
-            "status": "shipped",
-            "total": 10.2
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/reference/external/hal/hal.schema.md b/docs/reference/external/hal/hal.schema.md
index 54ceab70a..d1722171b 100644
--- a/docs/reference/external/hal/hal.schema.md
+++ b/docs/reference/external/hal/hal.schema.md
@@ -26,42 +26,13 @@ This external schema definition allows adding HAL expressions into an existing s
     "self": {
       "href": "/orders/523"
     },
-    "replacing": [
-      {
-        "href": "/orders/521"
-      },
-      {
-        "href": "/orders/520"
-      }
-    ],
+    "warehouse": {
+      "href": "/warehouse/56"
+    },
     "invoice": {
       "href": "/invoices/873"
     }
   },
-  "_embedded": {
-    "replacing": [
-      {
-        "_links": {
-          "self": {
-            "href": "/orders/521"
-          }
-        },
-        "currency": "USD",
-        "status": "open",
-        "total": 10.2
-      },
-      {
-        "_links": {
-          "self": {
-            "href": "/orders/521"
-          }
-        },
-        "currency": "EUR",
-        "status": "open",
-        "total": 10.2
-      }
-    ]
-  },
   "currency": "USD",
   "status": "shipped",
   "total": 10.2
@@ -74,9 +45,17 @@ This external schema definition allows adding HAL expressions into an existing s
     "self": {
       "href": "/orders/523"
     },
-    "warehouse": {
-      "href": "/warehouse/56"
-    },
+    "warehouses": [
+      {
+        "href": "/warehouse/56"
+      },
+      {
+        "href": "/warehouse/56"
+      },
+      {
+        "href": "/warehouse/56"
+      }
+    ],
     "invoice": {
       "href": "/invoices/873"
     }
@@ -93,21 +72,42 @@ This external schema definition allows adding HAL expressions into an existing s
     "self": {
       "href": "/orders/523"
     },
-    "warehouses": [
-      {
-        "href": "/warehouse/56"
-      },
+    "replacing": [
       {
-        "href": "/warehouse/56"
+        "href": "/orders/521"
       },
       {
-        "href": "/warehouse/56"
+        "href": "/orders/520"
       }
     ],
     "invoice": {
       "href": "/invoices/873"
     }
   },
+  "_embedded": {
+    "replacing": [
+      {
+        "_links": {
+          "self": {
+            "href": "/orders/521"
+          }
+        },
+        "currency": "USD",
+        "status": "open",
+        "total": 10.2
+      },
+      {
+        "_links": {
+          "self": {
+            "href": "/orders/521"
+          }
+        },
+        "currency": "EUR",
+        "status": "open",
+        "total": 10.2
+      }
+    ]
+  },
   "currency": "USD",
   "status": "shipped",
   "total": 10.2