[#58727872] changes related to the comments