Merge "Clean up wiki ID and DB domain ID handling"