Merge "[veridex] Reflection detection improvements." into pi-dev