Unify defined_lib_features
and lib_features
queries
#116092
+87
−82
Merged