Merge "Fix max bounds doesn't get updated on dual TDA build"