im not sure why you do not add it on v16 directly ?
because when you fix it after v17,
it means we need use v17 or the issue is still here on v16,
and v17 must have many small issues or bugs again as v16 has,
it may take us many time to check and test again.