Merge "add partial match for non-module capabilities - to enable deviations in base...