Feature/3404 multiple schema support for soledad

Closes #3404