WIP databrowser rc and fix integration cleanup