SWITCHYARD-1345: Context properties not scoped or labeled properly in ContextMappers