3.3.1/stable branch