Compatibility fix for api8
Merge develop