#2519, #2588 and #2733