Logging
Re-enabled logging
Merge commit '7c6022f6b18923be305d1f3c4c74cc00cfe6c19e'

Updates from upstream