[BUG #8608] Removed workaround
[BUG #8608] minor
[BUG #8608] Updated showcase