bring harlo fork up-to-date with GP fork