Merge "Clamp decoded feature data" into experimental