copyright updates
Merge branch '19-fixes' into 20