Merge OSCAR from 3.5 branch up to revision 600813.