Moved to 5.2.0, since these are being backported