[20519] Working update