merge updates from streamer45