#428 Resolved block update related issues with EIO conduits and TE conduits/blocks.
Merge branch 'master' into 1.6.4