#1480 and #1946