Bootstrap/Stream 3.1 Support