[TUHS] v7 upgrade