Preventing writes if a mapping already exists
Moved the mapping writes guard to the store itself
Merge branch 'mbst-9888-resolution-api' into stage