[MGN-36] Precisely match interpolation logic

Copy of relevant files from develop to dev/v2.0.x