HniDev | #3508 & 3559 | showcase feedback