closing feature #5362 HMI update + code improvements