Add IT for forUpdate() API
Merge branch 'master' into 3.1