This is an attempt of continuing the #10367 PR started by @kallewoof.
Got here through #11314
I really hope, I am not overstepping by submitting this PR, I tried to contact @kallewoof, but the user is not on slack. Since the PR was opened in May, I decided to try to help to improve it.
I addressed the nits mentioned and added the test for False