pforai: ported changes from real system to repo.