Merge branch 'amf/tooltip_update' into sprint68