Code

The new release fixes #739625 and #754230.