Merge "Fix build dependencies"