Merge "Test added support for MATCH_FACTORY_ONLY flag"