Huashan ressurection

Change-Id: I85691138d3e24569e802447e47c144dcba1a27d4
Signed-off-by: DHOMD <DHO@dho.im>