Support #3441 and Support #3440