HOTFIX: Introduce log flag