Merge official release 3.2