QA-169
merge with master