Merge "Add missing feature check"