include changes planned for 0.4 in 0.3 SafeTerminal