cc
Merge remote-tracking branch 'origin/odnoz' into odnoz

Conflicts:
	a.sql
Revert "cc"

This reverts commit 276b4b10a0b500e0977f92f1b15395ba423f4f35.
Revert "Revert "cc""

This reverts commit 9012bf4e43523e11ac5791931eb2620e6da84541.