Add hybrid
Merge branch 'hybrid' into package