Use new hybrid engine methods
Merge remote-tracking branch 'pa/hybrid2' into fjpa