BugId:51338 HAWelcome Minor yet important improvements.