Issue #2754069 by Jon Pugh: Merge remote-tracking branch 'origin/2754069-decouple-install' into 7.x-3.x