Issue #3590853: Make pipeline green

Shamir vsrequested to merge
issue/config_entity_icon-3590853:3590853-make-pipeline-green into 0.x

Closes #3590853

Merge request reports