#2992: update after review