Meld'd across changes from v1.65 as part of careful meld together.