On a point of clarification, you're working from an old document but I think that's already in Bill C-344. I think it's in the new bill, if you look at clause 1, the exact thing you were suggesting.
On December 5th, 2017. See this statement in context.