Compatibility with 2.6
Merge