6b15ecf278
Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7' * commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7': Revert the ANSWERING state.