(*) CTL-499 Improved logging weaving so obfuscated log calls are also supported