(cherry picked from commit 9f95a3a2b2132357708db03b9b4922f356150ff4)
(cherry picked from commit 0c5684905f44af211189bf674735b046858a5b86) # Conflicts: # frontend/components.d.ts # yarn.lock