#3549 for master