Story #63348520: Mapping state should indicate both types of bindings
Merge pull request #876 from reciprocity/feature/mapping-state

Story #63348520: Mapping state should indicate both types of bindings