#2378 and #2524