oleg fix from a1
Merge branch 'a1'