Merge "Depcrecate increment function (should have been done back in ICS)"