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