Merge "[PMSH] Add enhanced filtering to config spec"