Merge "Fixed remaning IDEA errors in DatabaseBase"