Merge pull request #314 from wmathurin/unstable20

Latest shared
Misc hybrid fixes
Merge pull request #315 from khawkins/misc_hybrid_fixes

Misc hybrid fixes