data license - more changes
Merge branch '4856-data-license' into next