[D#631] updates