This is the equivalent of moby/moby#45534 (see for additional insights and review discussion), and replaces an earlier PR attempt: #7566 (original author is not responding to feedback) Closes: #756...