Check in of plugin update to 2.5.2, plus some functionality updates