Diff requested by atlante45 - related to Job #19331.diff