Issue #3129074 by longwave, mondrake, Lal_, Suresh Prabhu Parkala, johnwebdev, jungle, kapilkumar0324: Refactor assertions that use return values in conditionals
mentioned in commit 42a10601
mentioned in commit 170d1ac6