Don't just {reply, Cmd, State} since that will end up going into send/2 - which will decide not to send...
merge bug25412 into stable
merge stable into default