#5863 for master