Update code changes for 3.1.2