Attempt to fix MC MicroDST for S21. Should be applied after MR !160 (merged), which this is based on.