roll MR3 stretchy changes into master
3 files changed