Merge pull request #1264 from Mbed-TLS/pre3.6.1_test_merge_upstream_dev

Merge development into -restricted