#2252 and #2364