OSCAR-0 Merging fix from 12.0
OSCAR-0