Merge pull request #96 from but-spanel/master

Recent preparations for the user tests
Merge remote-tracking branch 'origin-ipa320/master' into automerge