Merge branch 'backport-license-rst' (early part) into license-rst