Master moved a little while the RequestHandler refactoring work was in review so merge with master again.