Merge pull request #624 from boegel/v1.4.x

bug fixes for v1.4.0