GPII-802: Consistent bracing