Merge "[security] Make frro iteration thread-safe" into tm-qpr-dev