General presentation fixes
Fixing strange exception
Merge remote-tracking branch 'origin/presentation' into presentation