Merged 31c3 from v1.55 into v1.60 and fixed couple compile issues