Fix task 19517