]>
granicus.if.org Git - graphviz/log
Mark Hansen [Sat, 20 Feb 2021 03:45:51 +0000 (03:45 +0000)]
Merge branch 'smoosh' into 'master'
Push to git-SHA Docker image label
See merge request graphviz/graphviz!1766
Mark Hansen [Sat, 20 Feb 2021 03:44:31 +0000 (14:44 +1100)]
Push to git-SHA Docker image label
Keep the old image labels for backwards compatibility, just for now
Remove the filename scope: I want this to run every time we push, just
for now. We'll make this faster with caching soon.
Mark Hansen [Sat, 20 Feb 2021 03:39:12 +0000 (03:39 +0000)]
Merge branch 'smoosh' into 'master'
No-op: consolidate Docker Image building YAML
See merge request graphviz/graphviz!1765
Mark Hansen [Sat, 20 Feb 2021 03:36:11 +0000 (14:36 +1100)]
No-op: consolidate Docker Image building YAML
This should have the same effect while making it easier to change the
common docker image building code.
Matthew Fernandez [Wed, 17 Feb 2021 16:09:48 +0000 (16:09 +0000)]
Merge branch 'smattr/
faedcca5 -e012-4920-8e45-
5457d2ff984b ' into 'master'
misc clean up
See merge request graphviz/graphviz!1740
Matthew Fernandez [Thu, 11 Feb 2021 05:33:35 +0000 (21:33 -0800)]
squash some -Wimplicit-fallthrough compiler warnings
Matthew Fernandez [Thu, 11 Feb 2021 04:55:55 +0000 (20:55 -0800)]
remove some unnecessary void* casts
Matthew Fernandez [Thu, 11 Feb 2021 04:39:38 +0000 (20:39 -0800)]
remove our own CHAR_BIT definitions
We can just use those in the C standard library.
Matthew Fernandez [Wed, 17 Feb 2021 03:56:37 +0000 (19:56 -0800)]
Merge branch 'smattr/
150C537B -D311-4C5E-B421-
A4874CE8C5F4 '
Matthew Fernandez [Fri, 12 Feb 2021 02:53:57 +0000 (18:53 -0800)]
add Fedora to the noted list of downstream consumers
Related to #1941.
Matthew Fernandez [Wed, 17 Feb 2021 03:41:19 +0000 (03:41 +0000)]
Merge branch 'smattr/
E488F2BC -9394-4031-AB3D-
A8E6BC313197 ' into 'master'
remove some unnecessary sfstropen use
See merge request graphviz/graphviz!1738
Matthew Fernandez [Sun, 3 Jan 2021 17:27:19 +0000 (09:27 -0800)]
remove another use of sfstropen in GVPR
Related to #1873.
Matthew Fernandez [Sun, 3 Jan 2021 01:54:57 +0000 (17:54 -0800)]
remove an unnecessary use of sfstropen in GVPR
Related to #1873.
Matthew Fernandez [Wed, 17 Feb 2021 01:44:34 +0000 (01:44 +0000)]
Merge branch 'smattr/
25B6AB1C -1F36-4CEE-87BD-
F608C7459480 ' into 'master'
remove recapitulated prototypes of strcasecmp
See merge request graphviz/graphviz!1741
Matthew Fernandez [Thu, 11 Feb 2021 15:34:43 +0000 (07:34 -0800)]
remove recapitulated prototypes of strcasecmp
These actually cause warnings in CMake Windows builds:
…\lib\cgraph/strcasecmp.h(15,47): warning C4273: '_stricmp': inconsistent
dll linkage […\graphviz\build\plugin\gd\gvplugin_gd.vcxproj]
C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\string.h(193,22):
message : see previous definition of '_stricmp'
[…\build\plugin\gd\gvplugin_gd.vcxproj]
and MSBuild Windows builds:
…\lib\cgraph\strcasecmp.h(23,64): warning C4211: nonstandard extension used:
redefined extern to static […\graphviz\lib\cgraph\cgraph.vcxproj]
…\lib\cgraph\strcasecmp.h(27,75): warning C4211: nonstandard extension used:
redefined extern to static […\lib\cgraph\cgraph.vcxproj]
and Cygwin MinGW builds:
…/lib/cgraph/strcasecmp.h:15:5: warning: '_stricmp' redeclared without
dllimport attribute: previous dllimport ignored [-Wattributes]
15 | int strcasecmp(const char *s1, const char *s2);
| ^~~~~~~~~~
…/lib/cgraph/strcasecmp.h:16:5: warning: '_strnicmp' redeclared without
dllimport attribute: previous dllimport ignored [-Wattributes]
16 | int strncasecmp(const char *s1, const char *s2, size_t n);
| ^~~~~~~~~~~
Related to #1940.
Matthew Fernandez [Tue, 16 Feb 2021 16:01:17 +0000 (16:01 +0000)]
Merge branch 'add-gvpr-to-cmake-builds' into 'master'
Add gvpr to CMake builds
Closes #1878
See merge request graphviz/graphviz!1684
Magnus Jacobsson [Tue, 24 Nov 2020 23:13:28 +0000 (00:13 +0100)]
Remove unnecessary declaration of libc time function
Is available through '#include <time.h>'.
Magnus Jacobsson [Tue, 24 Nov 2020 21:40:45 +0000 (22:40 +0100)]
Remove unused sfexit.c and replace waitpid declaration with std
Magnus Jacobsson [Sun, 22 Nov 2020 07:13:00 +0000 (08:13 +0100)]
Remove gvpr from tools not built with CMake in ci/tests.py
Magnus Jacobsson [Sun, 22 Nov 2020 16:18:14 +0000 (17:18 +0100)]
Add skip of test_gvpr_example for 64-bit Windows builds
Fails because of https://gitlab.com/graphviz/graphviz/-/issues/1882.
Magnus Jacobsson [Sun, 22 Nov 2020 12:51:25 +0000 (13:51 +0100)]
Add skip of gvpr bbox & col test also for Windows CMake builds
Fails because of https://gitlab.com/graphviz/graphviz/-/issues/1784.
Magnus Jacobsson [Sun, 22 Nov 2020 10:55:53 +0000 (11:55 +0100)]
Fix gvpr -? to actually print usage and exit non-zero
Magnus Jacobsson [Sat, 21 Nov 2020 19:46:17 +0000 (20:46 +0100)]
Add build of cmd/gvpr using CMake
Resolves https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 11:48:55 +0000 (12:48 +0100)]
Add build of lib/gvpr using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 16:17:52 +0000 (17:17 +0100)]
Add build of lib/expr using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 19:34:48 +0000 (20:34 +0100)]
Add build of lib/ast using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 17:31:57 +0000 (18:31 +0100)]
Add build of lib/sfio using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sun, 22 Nov 2020 07:01:30 +0000 (08:01 +0100)]
Add missing lib/pack CMake dependency to lib/gvc
Matthew Fernandez [Mon, 15 Feb 2021 19:39:51 +0000 (19:39 +0000)]
Merge branch 'smattr/
10F637A0 -9721-4680-A7BA-
37B3CBE3BC2F ' into 'master'
silence some markdownlint warnings
See merge request graphviz/graphviz!1761
Matthew Fernandez [Mon, 15 Feb 2021 19:16:54 +0000 (11:16 -0800)]
silence some markdownlint warnings
Matthew Fernandez [Mon, 15 Feb 2021 05:02:08 +0000 (05:02 +0000)]
Merge branch 'smattr/
056A5DAD -1EFB-41E9-BDBF-
737CB8FA0DA2 ' into 'master'
fix: use public inheritance in VPSC hierarchy
See merge request graphviz/graphviz!1737
Matthew Fernandez [Sun, 3 Jan 2021 01:27:53 +0000 (17:27 -0800)]
remove now-unnecessary cast
Related to #1874.
Matthew Fernandez [Sun, 3 Jan 2021 01:25:19 +0000 (17:25 -0800)]
fix: use public inheritance in VPSC hierarchy
This removes some C++ undefined behavior where libvpsc casts of IncVPSC pointers
to VPSC pointers were invalid due to private inheritance. There was no need to
use private inheritance here, so we now simply use public inheritance. Fixes
#1874.
Matthew Fernandez [Sun, 14 Feb 2021 17:03:21 +0000 (17:03 +0000)]
Merge branch 'smattr/
8d9e1781 -cb6e-4eb7-a5fb-
7d1cca23f690 ' into 'master'
remove use of regex for identifying plugin libraries
See merge request graphviz/graphviz!1731
Matthew Fernandez [Fri, 5 Feb 2021 02:46:23 +0000 (18:46 -0800)]
remove use of regex for identifying plugin libraries
This removes some dynamic allocations and failure paths, accelerating the
determination of the "is this library a Graphviz plugin?" check. Though the root
motivation here is removing a dependency on regular expressions. The resulting
code being more efficient is a pleasant side effect. A step along the way to
#1919.
Matthew Fernandez [Fri, 5 Feb 2021 01:46:14 +0000 (17:46 -0800)]
remove unused DMKEY
Mark Hansen [Sun, 14 Feb 2021 05:53:50 +0000 (05:53 +0000)]
Merge branch 'smoosh' into 'master'
Smoosh some Dockerfile layers into one
See merge request graphviz/graphviz!1753
Mark Hansen [Sun, 14 Feb 2021 05:51:42 +0000 (16:51 +1100)]
Smoosh some Dockerfile layers into one
This is kind of a test for the new automatic building of dockerfiles.
This should make for smaller images and slightly faster CI runs.
The tradeoff is slower local builds if you'd cached the earlier bits.
But now we can easily build these on the cloud when changed.
Mark Hansen [Sun, 14 Feb 2021 05:39:30 +0000 (05:39 +0000)]
Merge branch 'remove-comment' into 'master'
Remove my hacky comment that forced CI builds of Dockerfiles
See merge request graphviz/graphviz!1752
Mark Hansen [Sun, 14 Feb 2021 05:38:54 +0000 (16:38 +1100)]
Remove my hacky comment that forced CI builds of Dockerfiles
Cleanup for #1943
Mark Hansen [Sun, 14 Feb 2021 05:34:38 +0000 (05:34 +0000)]
Merge branch 'list' into 'master'
Fix python typing warning
See merge request graphviz/graphviz!1744
Mark Hansen [Sun, 14 Feb 2021 05:06:17 +0000 (05:06 +0000)]
Merge branch 'cmake' into 'master'
Install cmake in ubuntu-18.04 image
See merge request graphviz/graphviz!1751
Mark Hansen [Sun, 14 Feb 2021 05:05:08 +0000 (16:05 +1100)]
Install cmake in ubuntu-18.04 image
I suppose sometime, canonical must have removed cmake from the deps of another package we installed.
Towards #1946
Mark Hansen [Sun, 14 Feb 2021 04:56:15 +0000 (04:56 +0000)]
Merge branch 'use-gitlab-containers' into 'master'
Pull images from GitLab Container Registry in CI
See merge request graphviz/graphviz!1750
Mark Hansen [Sun, 14 Feb 2021 04:50:05 +0000 (15:50 +1100)]
Pull images from GitLab Container Registry in CI
GitLab's container registry is pretty well-integrated with building the images, easier than pushing to DockerHub.
Less keys to manage too.
Towards #1943
Mark Hansen [Sun, 14 Feb 2021 04:36:10 +0000 (04:36 +0000)]
Merge branch 'powertools' into 'master'
Attempt fixing CentOS8 Dockerfile
See merge request graphviz/graphviz!1749
Mark Hansen [Sun, 14 Feb 2021 04:35:38 +0000 (15:35 +1100)]
Attempt fixing CentOS8 Dockerfile
Apparently this is now powertools, lowercase:
https://serverfault.com/questions/997896/how-to-enable-powertools-repository-in-centos-8
Towards #1945
Mark Hansen [Sun, 14 Feb 2021 04:32:59 +0000 (04:32 +0000)]
Merge branch '1910' into 'master'
Delete ubuntu-19.10 CI
Closes #1944
See merge request graphviz/graphviz!1748
Mark Hansen [Sun, 14 Feb 2021 04:32:26 +0000 (15:32 +1100)]
Delete ubuntu-19.10 CI
It's discontinued release, can't build Dockerfile any more.
Fixes #1944
Mark Hansen [Sun, 14 Feb 2021 04:20:44 +0000 (04:20 +0000)]
Merge branch 'docker-in-ci' into 'master'
Touch all the Dockerfiles to rebuild them
See merge request graphviz/graphviz!1747
Mark Hansen [Sun, 14 Feb 2021 04:19:54 +0000 (15:19 +1100)]
Touch all the Dockerfiles to rebuild them
And push them to the GitLab Container Registry
There's probably a nicer way to do this, but I'm not sure what it is. Maybe a manual job, or a variable that you can enable to trigger it?
Towards #1943
Mark Hansen [Sun, 14 Feb 2021 04:06:05 +0000 (04:06 +0000)]
Merge branch 'docker-in-ci' into 'master'
Add CI building of all Docker images
See merge request graphviz/graphviz!1746
Mark Hansen [Sun, 14 Feb 2021 03:53:47 +0000 (14:53 +1100)]
Add CI building of all Docker images
Only when we edit their respective Dockerfiles.
Towards #1943
Matthew Fernandez [Sun, 14 Feb 2021 03:37:27 +0000 (03:37 +0000)]
Merge branch 'smattr/
EFD0F12C -1BD3-412D-8DEE-
AF6E0B80C486 ' into 'master'
fix memory leak in mingle
See merge request graphviz/graphviz!1736
Mark Hansen [Sun, 14 Feb 2021 03:23:04 +0000 (03:23 +0000)]
Merge branch 'docker-in-ci' into 'master'
Experimental: build docker image in GitLab CI
See merge request graphviz/graphviz!1745
Matthew Fernandez [Sun, 3 Jan 2021 18:31:22 +0000 (10:31 -0800)]
fix: stop manually managing kdTree memory in mingle
This actually fixes a bug where the first kdTree allocation was being leaked due
to never being deleted. Related to #1832.
Matthew Fernandez [Sun, 3 Jan 2021 18:26:57 +0000 (10:26 -0800)]
remove manual memory management of dists in mingle
Related to #1832.
Matthew Fernandez [Sun, 3 Jan 2021 18:24:16 +0000 (10:24 -0800)]
remove manual memory management of nnIdx in mingle
Related to #1832.
Matthew Fernandez [Sun, 3 Jan 2021 18:20:43 +0000 (10:20 -0800)]
fix typo in mingle comment
Matthew Fernandez [Sun, 3 Jan 2021 18:15:09 +0000 (10:15 -0800)]
remove unnecessary using directive and #includes
This file does not reference any symbols from these.
Mark Hansen [Sun, 14 Feb 2021 02:03:14 +0000 (13:03 +1100)]
Experimental: build docker image in GitLab CI
Starting with just centos7
Following the instructions at https://about.gitlab.com/blog/2019/08/28/building-build-images/.
Haven't set up the environment variables yet.
Matthew Fernandez [Sun, 14 Feb 2021 03:02:22 +0000 (03:02 +0000)]
Merge branch 'smattr/
a8939803 -4471-4750-b95b-
5aa9fcb70802 ' into 'master'
remove unnecessary casts of cdt functions
See merge request graphviz/graphviz!1735
Matthew Fernandez [Sat, 6 Feb 2021 23:30:16 +0000 (15:30 -0800)]
remove no-op cast
Matthew Fernandez [Sat, 6 Feb 2021 23:29:34 +0000 (15:29 -0800)]
remove unnecessary casts of dtsearch() return value
These pointers implicitly coerce.
Matthew Fernandez [Sat, 6 Feb 2021 23:22:54 +0000 (15:22 -0800)]
remove unnecessary casts of dtprev() return value
These pointers implicitly coerce.
Matthew Fernandez [Sat, 6 Feb 2021 23:19:12 +0000 (15:19 -0800)]
remove unnecessary casts of dtlast() return values
These pointers implicitly coerce.
Matthew Fernandez [Sat, 6 Feb 2021 23:14:59 +0000 (15:14 -0800)]
remove unnecessary casts of dtnext() return value
These pointers implicitly coerce.
Matthew Fernandez [Sat, 6 Feb 2021 23:07:07 +0000 (15:07 -0800)]
remove unnecessary cast of dtfirst() return value
These pointers implicitly coerce.
Matthew Fernandez [Sat, 6 Feb 2021 22:57:21 +0000 (14:57 -0800)]
remove unnecessary casts of dtmatch() return values
These pointers implicitly coerce.
Matthew Fernandez [Sun, 14 Feb 2021 02:28:52 +0000 (02:28 +0000)]
Merge branch 'smattr/
87474991 -d226-4c2a-8e48-
daedb4cdde1c ' into 'master'
Keep the edge order in json output (!1728 plus test case)
See merge request graphviz/graphviz!1734
Graph [Wed, 3 Feb 2021 16:17:35 +0000 (00:17 +0800)]
Keep the edge order in json output
Matthew Fernandez [Sat, 6 Feb 2021 21:42:11 +0000 (13:42 -0800)]
expand a wrapper around calloc()
We're about to #include another header in this file that contains its own
conflicting definition of NEW().
Matthew Fernandez [Sat, 6 Feb 2021 20:55:35 +0000 (12:55 -0800)]
add some test cases of the JSON output
Matthew Fernandez [Sun, 14 Feb 2021 01:54:40 +0000 (01:54 +0000)]
Merge branch 'smattr/
DC781A13 -F00C-434C-A18F-
6ACC0AF4B3CC ' into 'master'
clean up some legacy unused config checks
See merge request graphviz/graphviz!1733
Mark Hansen [Sun, 14 Feb 2021 01:52:44 +0000 (12:52 +1100)]
Fix python typing warning
"""
List expression not allowed in type annotation
Use List[T] to indicate a list type or Union[T1, T2] to indicate a union typePylance
"""
Matthew Fernandez [Sat, 6 Feb 2021 21:36:37 +0000 (13:36 -0800)]
fix: remove orphaned MALLOC_H define
The logic to populate this was removed in
59bf93da69561600015ee3f2b747691d52228188 .
Matthew Fernandez [Sat, 6 Feb 2021 21:31:12 +0000 (13:31 -0800)]
remove mstats() detection
Graphviz does not depend on this.
Matthew Fernandez [Sat, 6 Feb 2021 21:30:29 +0000 (13:30 -0800)]
remove mallinfo() detection
Nothing in Graphviz depends on this.
Matthew Fernandez [Sat, 6 Feb 2021 21:29:06 +0000 (13:29 -0800)]
remove mallopt() detection
Nothing in Graphviz depends on this.
Matthew Fernandez [Sat, 13 Feb 2021 21:21:15 +0000 (21:21 +0000)]
Merge branch 'smattr/
34694182 -7a40-4f06-abc7-
e1218f680248 ' into 'master'
fix incorrect PS colors generated by Lefty and enable C99 warnings
See merge request graphviz/graphviz!1730
Matthew Fernandez [Wed, 3 Feb 2021 03:43:58 +0000 (19:43 -0800)]
enable some additional C99 compiler warnings
These can now be turned on without adding warnings to the Autotools build.
Matthew Fernandez [Wed, 3 Feb 2021 03:40:06 +0000 (19:40 -0800)]
fix incorrect colors in Lefty postscript output
This code intended to print color data to its output file in postscript (PS)
format. However it miscalculated the low nibble of each non-zero byte as 1 due
to an incorrect operator. This may have not been noticed in the resulting image
due to low precision. This was exposed by the compiler flag -Wlogical-op. Fixes
#1927.
At first glance, it looks like this could be written without shifting and
masking at all by simply printing the byte padded to width 2, but maybe I am
missing some subtlety.
Matthew Fernandez [Sat, 13 Feb 2021 20:47:16 +0000 (20:47 +0000)]
Merge branch 'smattr/
1FE7F116 -BD57-44DB-A463-
C712472A1CA6 ' into 'master'
add details of updating the website to the release procedure
See merge request graphviz/graphviz!1729
Matthew Fernandez [Wed, 3 Feb 2021 01:48:11 +0000 (17:48 -0800)]
add details of updating the website to the release procedure
This is addressing the following point I made in the 2.46.0 retrospective:
We probably need to incorporate www2.graphviz.org and graphviz.gitlab.io
actions into the release steps in DEVELOPERS.md.
It would be nice to further automate some of this in future.
Matthew Fernandez [Sat, 13 Feb 2021 20:13:28 +0000 (20:13 +0000)]
Merge branch 'smattr/
7654BD6A -00FB-419C-9CEE-
58F314E9471A ' into 'master'
fix HTML validation issues in FAQ.html
See merge request graphviz/graphviz!1727
Matthew Fernandez [Tue, 2 Feb 2021 05:21:26 +0000 (21:21 -0800)]
fix HTML validation issues in FAQ.html
Related to #1861.
Matthew Fernandez [Sat, 13 Feb 2021 19:36:38 +0000 (19:36 +0000)]
Merge branch 'smattr/
E0AA0C62 -2E41-45C8-8F0E-
C7CF13B57772 ' into 'master'
remove Python 2 pytest installation in CI
Closes #1886
See merge request graphviz/graphviz!1726
Matthew Fernandez [Tue, 2 Feb 2021 05:02:58 +0000 (21:02 -0800)]
remove Python 2 pytest installation in CI
We only support running the test suite with Python 3. Closes #1886.
Matthew Fernandez [Sat, 13 Feb 2021 19:02:31 +0000 (19:02 +0000)]
Merge branch 'smattr/
eb990658 -b367-436d-84a5-
fcb9dec533c3 ' into 'master'
remove dead suffix parsing code
Closes #1933
See merge request graphviz/graphviz!1725
Matthew Fernandez [Mon, 1 Feb 2021 03:32:56 +0000 (19:32 -0800)]
delete no longer used strton
Matthew Fernandez [Mon, 1 Feb 2021 03:11:37 +0000 (19:11 -0800)]
remove dead code for suffix handling of parsed numbers
This code attempted to handle a numeric suffix indicating a multiplier (e.g. 'k'
for 1024). However, the preceding logic that constructs a temporary buffer for
it to parse from does not anticipate suffixes and copy them to the buffer. The
(inactive) suffix code is considered only useful for describing file sizes, so
not relevant to enable for Graphviz. Closes #1933.
Matthew Fernandez [Sat, 13 Feb 2021 18:29:22 +0000 (18:29 +0000)]
Merge branch 'smattr/
D1537418 -F027-4305-8650-
1E45D1B2F6B1 ' into 'master'
update Graphviz URLs in comments
See merge request graphviz/graphviz!1724
Matthew Fernandez [Sun, 31 Jan 2021 19:39:37 +0000 (11:39 -0800)]
update Graphviz URLs in comments
Matthew Fernandez [Sat, 13 Feb 2021 17:54:33 +0000 (09:54 -0800)]
Merge 'Start 2.46.2 development series' into master
Matthew Fernandez [Sat, 13 Feb 2021 17:03:53 +0000 (09:03 -0800)]
Start 2.46.2 development series
Matthew Fernandez [Sat, 13 Feb 2021 17:02:13 +0000 (17:02 +0000)]
Merge branch 'smattr/
63291F41 -E610-4E9F-B12E-
1566969C0FDA ' into 'master'
Stable Release 2.46.1
See merge request graphviz/graphviz!1732
Matthew Fernandez [Sat, 6 Feb 2021 19:34:28 +0000 (11:34 -0800)]
Stable Release 2.46.1
Matthew Fernandez [Sat, 6 Feb 2021 19:23:11 +0000 (19:23 +0000)]
Merge branch 'smattr/
DD8B4ECD -399B-4BEF-AD77-
3EF40BA4402E ' into 'master'
Properly fill graphviz_version.h (!1706 plus test case)
See merge request graphviz/graphviz!1723
Kevin Funk [Thu, 21 Jan 2021 10:39:01 +0000 (11:39 +0100)]
Properly fill graphviz_version.h
Make sure the variables used inside the header template are populated.
Prior to this patch we ended up with this in the generated
graphviz_version.h:
#define PACKAGE_VERSION ""
Edit by Matthew Fernandez: Added changelog entry and flipped polarity on the
CMake test case for this.
Matthew Fernandez [Sun, 31 Jan 2021 17:48:06 +0000 (09:48 -0800)]
add a test of PACKAGE_VERSION
Related to !1706.