merge build & tools related changes
merge common src related changes