am a7a6a3a5: Fix issues with Local

* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
  Fix issues with Local