[#75262164] Updates after review #2