Github-Pull: #5494 Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
- add a missing license header - correct some header orderings etc.