CURRIKI-6214

New no avatar  replacement attempt