Merge branch 'hotfix/0.21.18'
Improve logging; add missing main block.
Remove log-silencing import side-effect.