[Fixed #83896180 #83896026] Added filters and fixes
[ci skip]