Merge change 26118 into eclair

* changes:
  Clean up recent submission per stadler