Merge xxlimited compile warning fix from 3.4