Merge: Merge downstream changes

Changes included documentation revisions on licensing matters