Start of hotfix development
Update from upstream
Version bump 1.4.2
Merge branch 'hotfix/1.4.2'