merged rename_on_location_change branch

2019-04-04, Edouard Tisserant