State description from Vlad.
Merge branch 'master' into python_refactor