Updated build file as first step of See #10440