chore(repo): Port changes from #7392#7393

nikosdouvlis merged 4 commits intovincent-and-the-doctorclerk/javascript:vincent-and-the-doctorfrom

vaggelis/port-7392-to-core3clerk/javascript:vaggelis/port-7392-to-core3Copy head branch name to clipboard