Merge change 22135 into eclair

* changes:
  Support full length rendering.