Do not merge

port stretchy from master
5 files changed