Merge branch 'amf/manifest_cleanup' into sprint49