Update changes and version to 3.1.21