DB schema fix
Merge remote-tracking branch 'origin/mixalis-a2' into michael-a3