Map snapshot added on resign active
Merge branch 'master' into coreLocation