And fix copyright headers in new code.
Backported from ba68383706. Co-authored-by: Ugis Brekis <ugis.brekis@productmadness.com>
ba68383706