Merge refdb backend changes