Cherrypick Oliver patches

STE commits are not merged yet :/