For PR540: