Merge "Handle hint in unspecified specs" into mnc-ub-dev