[#58728096] changes related to the comments