Applied in 9f669a8e39906448ab0fa837ccb0b452f7fbef0d