Prepare 3.1.5 release
Correct duplicated update queries