Can we cherry-pick #692 in here first? Otherwise it's going to be a merge nightmare :frowning: