Merge td3511 fixes into branch

Signed-off-by: Stefan Schake <schake@embedded.rwth-aachen.de>