[TASK] Added original HaPi github changes