Bring experimental up-2-date with master

Fixing bugs and merging upstream commits