Fix compile breaking bug
Merge dev