Merge "License header is not correct"