Merge "Fix Regression for Oneshot Test" into main