Merge branch 'cipy-improved-logging'