Merge "Release fails when non-git map entries encountered This is a squashed version of my previous patch"