MDL-22184 Re-execution of the fixed AMOScript from Sam's commit