merge in nyc-mr1-security-c-release history after reset to 64979de8f9cc4d528cd334561e15f666047a2b46