Merge "Address comments from blueprint patches"