Merge branch 'bug-1459' into release (Emergency bugfix)