Merge branch 'amf/manifest_fix' into sprint60