This MR is to fix the issue reported on ATR-24015, ATLASRECTS-6566 and ATLASRECTS-6561.
tagging @htorres