Merge "old paths contains all entries when updating" into pi-dev