Merge r65001 from shell-experiments branch: