It is not part of this PR. I just wonder if it is possible to create a condition that covers all possible situations. If it is, Culprit, you should be the only one who can create it, because I have no idea when and how are all those functions called. So please, either give it your time and post here how condition should look like, or I will close it, as we are not able to compose valid and working condition.