Merge branch 'hotfix/1.3.4'
Enforce setting of a timeout value for all assignments
Release version 1.3.5
Merge branch 'hotfix/1.3.5' into develop