cherry-pick changes from exp-jenny branch