Merge "Fix resolution of features referring to dependencies." into main