Resolve #3301502 "Covering remained entities"

Salim Qazizadarequested to merge
issue/inspector_theme-3301502:3301502-covering-remained-entities into 1.0.x

Closes #3301502

Merge request reports