finished building

(cherry picked from commit 20e5c3cc18b794991578b65c091bcbc62b7c34fd)