Merge "Add fix for build dependecies"