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