ok, that will not happen for 2.1 series I would guess, so this PR is still valid and LGTM