Diff requested by wynton - related to Job #19384.diff