Release 13.1

Merge changes for soft release and code freeze