-Rock 1.0 upgrade Accountability fix