[AoD] avoided the non-thread safe SDF.
Merge branch 'origin/amit-trunk'