Issue/deprecated warnings accumulate 1001595

Should be backported to 3.0.x branch.

Have a look at the commits' messages for more details.