Merge "Fix issue 5355047: Automated effect tests fail."