Merge commit 'bf938e86830617f976ce4ac0b504e7d732290f90' into 7.x-3.0-dev