(x) Fixed issue where non-generic method would be weaved as generic method
Merge branch 'release/1.11.0'