chore: Port changes made in #7314#7376

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

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