Added support for 5.6
Merge