stable merge

pinging @till :bell: