Merge from v.7.1.14 branch