checkin and copy for 12.1

{"approve": "license and version number unchanged: 2.21.0"}