+1. I also think it would be a good idea to backport it to 5.2.