Preserve Comments doubling.
Merge branch 'dev' into comments
Fix banner blinking