merge build & test related changes