Preparing for 1.3.1-o update