Merge pull request #1136 from yanesca/fix-marvin-attack-backport

Fix for the Marvin attack - BACKPORT