Fixes #780

Fixes #780 -- get's those three merges in line with v3.