Merge branch 'amf/bundle_util_fix' into sprint53