Merge "Revert "Install for all on replace"" into pi-dev