[Bug 8124] Patch "Context for compare functions"