Issue #3458112 by Hetal.Solanki, NexusNovaz, batigolix, deepak5423: Make code pass the gitlab pipeline