Manual merge to integ-home to fix a conflict