Forward-port upgrade scripts from recent releases