Merge "Update consumption limit constants." into tm-dev