pr-9321-058c7d vs. 5.0-13810 / sw-lin-mesa / rs2-zfreeze

pr-9321-058c7d (058c7db8) Diff 5.0-13810 (089250fd)
bbf1c8f21c4463de24747f85acd5587b595aaa10 Failure
bce6e0ff0345b1008ff2a2d957b038fd4cce8dfe Failure