changes to avoid invalid thread access exceptions
Authored by: anprabhu 2013-06-26
Parent: [r911]
Child: [r913]