LP1832897 and LP1721036: stamping upgrade scripts