FIX: 3.1 extension API updates
Merged
Merged
Merge