comments here and there
Merge remote-tracking branch 'refs/remotes/kali/remove_comments' into develop