Merge "Removing logging (issue 6583911)" into jb-dev