Direct commit to stable/10 reflecting r269815 because rest can't be merged

Add otp-sha