Updated build files as first step of See #10440