Merge remote-tracking branch 'origin/vpaid-fix' into 3.9.4