Roll-up version for recent bug fixes