+Gen3 modules can be changed in EERPOM to allow mirror fold with comfort lock on the remote button.
None of the modules that'll fit the mk5 can fold by only pressing lock buttons once - you need to hold the button and use comfort closing.
However if you swap you old CECM+CCM modules and build it all over to a BCM like I did - then It's possible to change the comfort press time on the remote in the BCM EEPROM :)