Merge pull request #795 from jikuja/fixes_for_v1.4.0

Fixes for v1.4.0
WIP