Merge "Added check to copy AVB footer"