Merge from master 1.9.3.2