Updated Core to 7.31 version
Merge commit '3a3490acdb5ca327878dcaa29b8270e5861fc23e' into 7.x-stable