[#60163648] Added implementation