Merged MD Prod version 141 from REL onto Open source master (needs testing) (T89)