Merge branch 'backport-license-rst' into license-rst