Fix for NullPointerException after viewing a log captured from an OHS client
Merge branch 'release_v3.9.0' into dev-loyola