Merge "API DB commit and sticky DC cookie fixes"