Failing test
Before/after map callbacks; closes #503
Merge branch 'BeforeAfterMap' into develop