Note: even if the regression didn't impacted 16.4.6, the original bug was present there so I applied the fix in it too.