#5849 missing in master merge