Small fixes
Bug fix for acceptance tests
Merge with develop branch
Merge remote-tracking branch 'origin/develop' into develop