Preparing for DEV-3.1.1