meld'd in changes from v1.65. Do not use merge.