Merge change I9a8a3d9d into eclair

* changes:
  Fix FastTrack recycling consistency issues, shadows.