Content views merge in master