Backport master 7.0.1

Do not merge before oC7 release