Note 16.11.9 in d/changelog