Merged cs 2198 from trunk - fixes in stackstream
Authored by: artyom-beilis 2012-08-09
Parent: [r2198]
Child: [r2200]