small fixes
Merge remote-tracking branch 'origin/Sprint-5' into small-fixes
more fixes
Merge remote-tracking branch 'origin/small-fixes' into Sprint-5