For PR723: