Merge "Add more helpful exception to design components" into mnc-ub-dev