Merge "Update ACM design arch docs"