Backport #3076#3078

allanrenucci merged 2 commits intoscala:0.3.xscala/scala3:0.3.xfrom

allanrenucci:0.3.xallanrenucci/dotty:0.3.xCopy head branch name to clipboard