#241: ru date control
Merge branch 'dev-master' into templating