Merge "Check feature before running test" into klp-modular-dev