pkurowski v8
pkurowski v9
pkurowski v10
Merge branch 'topic-piter2'