#3638, #3731 - modifications concerning the Track features on TRH, #3833 - Bug fix