Merge "Factor out new qualifiedTableComponents() Database method"