merge upstream (drop log viewer)

Signed-off-by: Zoey <zoey@z0ey.de>