Looks good. Thanks! Closes #637 Upstream-commit: 422edd513a5e1ea30ea65352af213af7856a661e Component: engine