Bugfix/migration change to locations and lpins