Merge branch 'amf/eview_error' into sprint60