PWMVPDEF-320 Make the extension compatible with 4.1.5