Wip/merge 0.13.5

Bring latest fixes from 0.13.5 forward.