Timos correction on part 4
Merge remote-tracking branch 'bb/tbetz/timos-correction-on-part-4-1404917747644'