Merge branch '21-scalars' into 24
update copyright notices
Merge branch '24-copyright' into 25