index on history: 6385312 - addfileReplacement in feature was not working
On history: improved history
Merge commit '7f360eb1fd9d89d6db43d73c9913edaeb95da8d0' into history
- conflicts