LP1842940: stamping and slight tweak to upgrade script