issue #1920
follows #1902 #1916 #1919