[#69988532] PR  comments addressed