#4630 renamed