KAZOO-1208: update pull request to support backward compatibility