Allow mappings to include matching versions
Merge remote-tracking branch 'upstream/develop' into develop