r1525
*Follow up r1519