Changes to reduce the size of linux build
Changes to reduce the size of linux build
Change to remove compilation warnings
Change to remove compilation warnings
Merge from upstream