fix salting in progress
merges upstream to origin