Will be fixed by #4679