chore(repo): Port changes introduced in #7372 #7375

octoper merged 2 commits intovincent-and-the-doctorclerk/javascript:vincent-and-the-doctorfrom

vaggelis/port-7372-to-vincent-and-the-doctorclerk/javascript:vaggelis/port-7372-to-vincent-and-the-doctorCopy head branch name to clipboard