Merge "Guard call setting security fix with flag." into main