Diff requested by dmtry - related to Job #19337.diff