Merge "Use the correct interpolators in the design lib" into mnc-ub-dev