static
Merge branch 'iuriy'