merge_copyrights revision 012a352f4b26cfd874db8d06debc495c2303e8b2