@guigzzz: Is #504521 still