Fix unnecessary assignment.
Merge branch 'storyboard-fix' into dev