Upgrade 6A


FIXME('us_reset_note')