#2360, #2376 and #2396