Snapshot 19.8.

NHP bug needs to be fixed