Merge branch 'hotfix/0.2.0.4'
serialRestoreTimeOut = None at the start of the script, so it doesnt fail at being undefined later
Merge branch 'hotfix/0.2.0.4.1' into develop