#554 addendum d97894e64d3