Same as #3715, but for master: