Merge change 27323

* changes:
  Fix up ls -s.