Merge "fix CLIP_S16" into mnc-dr-dev