#3864 for master