artf788851 and artf776514 fixes