Merge branch 'amf/update_method' into sprint79