This is a fresh MR. However it is the continuation of MR !39273 (closed) as it was giving some conflicts. I tried to resolve the conflicts and placed this new MR