SONAR-5718 Fix fading issues in FF