fix s8073 branch