trunk-tracking: update to build with mps r3537