Change source file header format
Merge branch 'topic/FixFileHeaders' into develop