Merge branch 'bugfix/408' into 'develop'