Add db component mastersconfig tests
Merge branch 'staging' into development