added wait for trailblock to be visible
Merge remote-tracking branch 'upstream/master'