HNI DEV | #3559 and #3508 feedback