Unify defined_lib_features and lib_features queries
#116092
Merged
defined_lib_features and lib_features queries
#116092