Merge "Release 3.2.38"