Merge "Add a condition and remove resources when skipping post install"