Certain changes to another bug branch were not incorporated into this branch