Merge branch 'fix/1557-gets-local-pack' into 'develop'