Merge branch 'amf/sm_update' into sprint83