Extend for Resource-Status-Matcher __again__. Because it was lost in the process of fix conflicts