Remove header comment
Merge branch 'dev'