OAT-31
Delivery extension quality, unit tests
merge OAT-31_20141003
Merge branch 'OAT-31_20141003' into OAT-31