LPS-40214 Finish method contract change introduced by commit a5df1d03d