Merge "Fix issue #25673462: Shamu update from MMB29J -> 29K does not complete"