Applied in eec01e79ff44a36b788ea37c8a85fde0fbb4f72c