Do not merge

port stretchy from master
4 files changed