3.1.1-Dev baseline