Merge "Add "do not kill" install option" into nyc-dev