Merge "Check feature availability before running tests"