Merge branch 'dima_kor' into AlexanderNaumenko
Saving to the DB.
Merge branch 'AlexanderNaumenko' into dima_kor