Implement Steadfast 0.9 changes into branch