#5862 for master