Moving 1.5.7 warning to mainline