Minor engineering changes before integration
Authored by: sofitsa 2010-03-12
Parent: [r835]
Child: [r837]