Merge commit '71ba5d6144aa42b70c085735c904e72f7200ad07' into 6.x-3.3-dev