Needed to make this merge visible to discourage others from trying to also make tweaks to the same code.