Authored/pushed by ic-builder; PR to main; ic-reviewer approves. https://projects.knownelement.com/issues/442