Manually merged ++auto fix from commit 430b3ce1