When done, #6446 must be appliable without regression
When done, #6446 must be appliable without regression